Adding support for client options