Added accessor to client and command