Added Factory::FillTemplate to remove the need for the addItem macro