Added extra attributes and templates