Broke out modelService into individual class based factories.