0.2 Rationalised the templates