Refactored DataHandler to ConnectionHandler