Added client handler class and added trace statements