Templates and Factories v0.6.1