laying new foundation for model factory