added few handlers in client