Added AttributeTypeName, PermissionKeyName, PermissionKeyDescription contexts