Updated to new IceHouse clients