adding new model factory support