Updates in the templates
Forgot a class :(