Adding support for client modes