Add support for client requests