Modifications to ModelFactory