Refactored model into DataConnector and ModelFactory.