added the key handlers for client