Added client shim