Moved DataConnectionHandler into a separate file