changes to support a raw client