Added client handler class