Add support for client mode