Changed the factory template