Template and assets extension improvements