Added enums for NameType and LinkType