changes to framework model factory