updated templates with new classes and to build with component