Several fixes for customer templates
Versioning