Added new tags to the enumeration