Implemented better parsing of attribute value templates