Added client handler class and added trace statements
Merged from master