Adding support for client API