updated factory templates