Changes to ClientSocketHandler