Changed class Templates and removed <p> in properties definition