Improved

Manage templates via code