Added new tags for it to be a template