Improve ClientCommand event