Proper Category template handling
Versioning