Updated classes in template