Added in more tags and templateType into metadata