From c3ff29d622b0166058a494fbe398f166b21f1f39 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Sun, 30 Aug 2015 15:21:28 +0200
Subject: [PATCH] Reformat attribute mapping files.

---
 attributemap/addurnprefix.php    |  32 +--
 attributemap/feide-oid.php       |  37 +---
 attributemap/name2claim.php      |  20 +-
 attributemap/name2oid.php        | 368 +++++++++++++++----------------
 attributemap/name2urn.php        | 366 +++++++++++++++---------------
 attributemap/oid-feide.php       |  16 +-
 attributemap/oid2name.php        | 324 +++++++++++++--------------
 attributemap/oid2urn.php         | 322 +++++++++++++--------------
 attributemap/openid2name.php     |  61 +++--
 attributemap/removeurnprefix.php |  32 +--
 attributemap/test.php            |  35 +--
 attributemap/urn2name.php        | 366 +++++++++++++++---------------
 attributemap/urn2oid.php         | 364 +++++++++++++++---------------
 13 files changed, 1135 insertions(+), 1208 deletions(-)

diff --git a/attributemap/addurnprefix.php b/attributemap/addurnprefix.php
index 7b9bc08f1..9d9877c00 100644
--- a/attributemap/addurnprefix.php
+++ b/attributemap/addurnprefix.php
@@ -1,20 +1,20 @@
 <?php
 
 $attributemap = array(
-	'sn'						=> 'urn:mace:dir:attribute-def:sn',
-	'telephoneNumber'			=> 'urn:mace:dir:attribute-def:telephoneNumber',
-	'facsimileTelephoneNumber'	=> 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
-	'postalAddress'				=> 'urn:mace:dir:attribute-def:postalAddress',
-	'givenName'					=> 'urn:mace:dir:attribute-def:givenName',
-	'homePhone'					=> 'urn:mace:dir:attribute-def:homePhone',
-	'homePostalAddress'			=> 'urn:mace:dir:attribute-def:homePostalAddress',
-	'mail'						=> 'urn:mace:dir:attribute-def:mail',
-	'mobile'					=> 'urn:mace:dir:attribute-def:mobile',
-	'preferredLanguage'			=> 'urn:mace:dir:attribute-def:preferredLanguage',
-	'eduPersonPrincipalName'	=> 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
-	'eduPersonAffiliation'		=> 'urn:mace:dir:attribute-def:eduPersonAffiliation',
-	'eduPersonScopedAffiliation'	=> 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
-	'eduPersonEntitlement'		=> 'urn:mace:dir:attribute-def:eduPersonEntitlement',
-	'eduPersonOrgDN'			=> 'urn:mace:dir:attribute-def:eduPersonOrgDN',
-	'eduPersonOrgUnitDN'		=> 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
+    'sn'                         => 'urn:mace:dir:attribute-def:sn',
+    'telephoneNumber'            => 'urn:mace:dir:attribute-def:telephoneNumber',
+    'facsimileTelephoneNumber'   => 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
+    'postalAddress'              => 'urn:mace:dir:attribute-def:postalAddress',
+    'givenName'                  => 'urn:mace:dir:attribute-def:givenName',
+    'homePhone'                  => 'urn:mace:dir:attribute-def:homePhone',
+    'homePostalAddress'          => 'urn:mace:dir:attribute-def:homePostalAddress',
+    'mail'                       => 'urn:mace:dir:attribute-def:mail',
+    'mobile'                     => 'urn:mace:dir:attribute-def:mobile',
+    'preferredLanguage'          => 'urn:mace:dir:attribute-def:preferredLanguage',
+    'eduPersonPrincipalName'     => 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
+    'eduPersonAffiliation'       => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
+    'eduPersonScopedAffiliation' => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
+    'eduPersonEntitlement'       => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
+    'eduPersonOrgDN'             => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
+    'eduPersonOrgUnitDN'         => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
 );
diff --git a/attributemap/feide-oid.php b/attributemap/feide-oid.php
index 34ee2d5e8..dc94cd7a4 100644
--- a/attributemap/feide-oid.php
+++ b/attributemap/feide-oid.php
@@ -1,39 +1,6 @@
 <?php
 
 $attributemap = array(
-	'mobile'		=> 'urn:mace:dir:attribute-def:mobile',
-	'displayName' 	=> 'urn:oid:2.16.840.1.113730.3.1.241',
+    'mobile'      => 'urn:mace:dir:attribute-def:mobile',
+    'displayName' => 'urn:oid:2.16.840.1.113730.3.1.241',
 );
-
-/*
-
-ShibMapAttribute urn:mace:dir:attribute-def:sn Shib-LDAP-Surname surname
-ShibMapAttribute urn:mace:dir:attribute-def:telephoneNumber Shib-LDAP-telephoneNumber telephoneNumber
-ShibMapAttribute urn:mace:dir:attribute-def:facsimileTelephoneNumber Shib-LDAP-facsimileTelephoneNumber facsimileTelephoneNumber
-ShibMapAttribute urn:mace:dir:attribute-def:postalAddress Shib-LDAP-postalAddress postalAddress
-ShibMapAttribute urn:mace:dir:attribute-def:givenName Shib-LDAP-givenName givenName
-ShibMapAttribute urn:mace:dir:attribute-def:homePhone Shib-LDAP-homePhone homePhone
-ShibMapAttribute urn:mace:dir:attribute-def:homePostalAddress Shib-LDAP-homePostalAddress homePostalAddress
-ShibMapAttribute urn:mace:dir:attribute-def:mail Shib-LDAP-mail mail
-ShibMapAttribute urn:mace:dir:attribute-def:mobile Shib-LDAP-mobile mobile
-ShibMapAttribute urn:mace:dir:attribute-def:preferredLanguage Shib-LDAP-preferredLanguage preferredLanguage
-#
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonPrincipalName Shib-EP-PrincipalName eppn
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonAffiliation Shib-EP-Affiliation affiliation
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonScopedAffiliation Shib-EP-ScopedAffiliation scopedAffiliation
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonEntitlement Shib-EP-Entitlement entitlement
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonOrgDN Shib-EP-OrgDN orgDN
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonOrgUnitDN Shib-EP-OrgUnitDN orgUnitDN
-#
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID Shib-SwissEP-UniqueID uniqueID
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonDateOfBirth Shib-SwissEP-DateOfBirth dateOfBirth
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonGender Shib-SwissEP-Gender gender
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonHomeOrganization Shib-SwissEP-HomeOrganization homeOrganization
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonHomeOrganizationType Shib-SwissEP-HomeOrganizationType homeOrganizationType
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch1 Shib-SwissEP-StudyBranch1 studyBranch1
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch2 Shib-SwissEP-StudyBranch2 studyBranch2
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch3 Shib-SwissEP-StudyBranch3 studyBranch3
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-SwissEP-StudyLevel studyLevel
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
-
-*/
diff --git a/attributemap/name2claim.php b/attributemap/name2claim.php
index 015a3d870..482bb6d8b 100644
--- a/attributemap/name2claim.php
+++ b/attributemap/name2claim.php
@@ -1,13 +1,13 @@
 <?php // Maps AD LDAP to Claims from http://msdn.microsoft.com/en-us/library/hh159803.aspx
 $attributemap = array(
-	'c' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country',
-	'givenName' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname',
-	'mail' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
-	'memberOf' => 'http://schemas.microsoft.com/ws/2008/06/identity/claims/role',
-	'postalcode' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode',
-	'uid' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name',
-	'sn' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname',
-	'st' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince',
-	'streetaddress' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress',
-	'telephonenumber' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone',
+    'c'               => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/country',
+    'givenName'       => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname',
+    'mail'            => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+    'memberOf'        => 'http://schemas.microsoft.com/ws/2008/06/identity/claims/role',
+    'postalcode'      => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/postalcode',
+    'uid'             => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name',
+    'sn'              => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname',
+    'st'              => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/stateorprovince',
+    'streetaddress'   => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/streetaddress',
+    'telephonenumber' => 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/otherphone',
 );
diff --git a/attributemap/name2oid.php b/attributemap/name2oid.php
index 90f689a0e..cbf669feb 100644
--- a/attributemap/name2oid.php
+++ b/attributemap/name2oid.php
@@ -1,187 +1,187 @@
 <?php
 $attributemap = array(
-	'aRecord' => 'urn:oid:0.9.2342.19200300.100.1.26',
-	'aliasedEntryName' => 'urn:oid:2.5.4.1',
-	'aliasedObjectName' => 'urn:oid:2.5.4.1',
-	'associatedDomain' => 'urn:oid:0.9.2342.19200300.100.1.37',
-	'associatedName' => 'urn:oid:0.9.2342.19200300.100.1.38',
-	'audio' => 'urn:oid:0.9.2342.19200300.100.1.55',
-	'authorityRevocationList' => 'urn:oid:2.5.4.38',
-	'buildingName' => 'urn:oid:0.9.2342.19200300.100.1.48',
-	'businessCategory' => 'urn:oid:2.5.4.15',
-	'c' => 'urn:oid:2.5.4.6',
-	'cACertificate' => 'urn:oid:2.5.4.37',
-	'cNAMERecord' => 'urn:oid:0.9.2342.19200300.100.1.31',
-	'carLicense' => 'urn:oid:2.16.840.1.113730.3.1.1',
-	'certificateRevocationList' => 'urn:oid:2.5.4.39',
-	'cn' => 'urn:oid:2.5.4.3',
-	'co' => 'urn:oid:0.9.2342.19200300.100.1.43',
-	'commonName' => 'urn:oid:2.5.4.3',
-	'countryName' => 'urn:oid:2.5.4.6',
-	'crossCertificatePair' => 'urn:oid:2.5.4.40',
-	'dITRedirect' => 'urn:oid:0.9.2342.19200300.100.1.54',
-	'dSAQuality' => 'urn:oid:0.9.2342.19200300.100.1.49',
-	'dc' => 'urn:oid:0.9.2342.19200300.100.1.25',
-	'deltaRevocationList' => 'urn:oid:2.5.4.53',
-	'departmentNumber' => 'urn:oid:2.16.840.1.113730.3.1.2',
-	'description' => 'urn:oid:2.5.4.13',
-	'destinationIndicator' => 'urn:oid:2.5.4.27',
-	'displayName' => 'urn:oid:2.16.840.1.113730.3.1.241',
-	'distinguishedName' => 'urn:oid:2.5.4.49',
-	'dmdName' => 'urn:oid:2.5.4.54',
-	'dnQualifier' => 'urn:oid:2.5.4.46',
-	'documentAuthor' => 'urn:oid:0.9.2342.19200300.100.1.14',
-	'documentIdentifier' => 'urn:oid:0.9.2342.19200300.100.1.11',
-	'documentLocation' => 'urn:oid:0.9.2342.19200300.100.1.15',
-	'documentPublisher' => 'urn:oid:0.9.2342.19200300.100.1.56',
-	'documentTitle' => 'urn:oid:0.9.2342.19200300.100.1.12',
-	'documentVersion' => 'urn:oid:0.9.2342.19200300.100.1.13',
-	'domainComponent' => 'urn:oid:0.9.2342.19200300.100.1.25',
-	'drink' => 'urn:oid:0.9.2342.19200300.100.1.5',
-	'eduOrgHomePageURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.2',
-	'eduOrgIdentityAuthNPolicyURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.3',
-	'eduOrgLegalName' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.4',
-	'eduOrgSuperiorURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.5',
-	'eduOrgWhitePagesURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.6',
-	'eduPersonAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1',
-	'eduPersonAssurance' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
-	'eduPersonEntitlement' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
-	'eduPersonNickname' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
-	'eduPersonOrgDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
-	'eduPersonOrgUnitDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
-	'eduPersonPrimaryAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
-	'eduPersonPrimaryOrgUnitDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.8',
-	'eduPersonPrincipalName' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6',
-	'eduPersonScopedAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
-	'eduPersonTargetedID' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
-	'email' => 'urn:oid:1.2.840.113549.1.9.1',
-	'emailAddress' => 'urn:oid:1.2.840.113549.1.9.1',
-	'employeeNumber' => 'urn:oid:2.16.840.1.113730.3.1.3',
-	'employeeType' => 'urn:oid:2.16.840.1.113730.3.1.4',
-	'enhancedSearchGuide' => 'urn:oid:2.5.4.47',
-	'facsimileTelephoneNumber' => 'urn:oid:2.5.4.23',
-	'favouriteDrink' => 'urn:oid:0.9.2342.19200300.100.1.5',
-	'fax' => 'urn:oid:2.5.4.23',
-	'federationFeideSchemaVersion' => 'urn:oid:1.3.6.1.4.1.2428.90.1.9',
-	'friendlyCountryName' => 'urn:oid:0.9.2342.19200300.100.1.43',
-	'generationQualifier' => 'urn:oid:2.5.4.44',
-	'givenName' => 'urn:oid:2.5.4.42',
-	'gn' => 'urn:oid:2.5.4.42',
-	'homePhone' => 'urn:oid:0.9.2342.19200300.100.1.20',
-	'homePostalAddress' => 'urn:oid:0.9.2342.19200300.100.1.39',
-	'homeTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.20',
-	'host' => 'urn:oid:0.9.2342.19200300.100.1.9',
-	'houseIdentifier' => 'urn:oid:2.5.4.51',
-	'info' => 'urn:oid:0.9.2342.19200300.100.1.4',
-	'initials' => 'urn:oid:2.5.4.43',
-	'internationaliSDNNumber' => 'urn:oid:2.5.4.25',
-	'isMemberOf' => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1',
-	'janetMailbox' => 'urn:oid:0.9.2342.19200300.100.1.46',
-	'jpegPhoto' => 'urn:oid:0.9.2342.19200300.100.1.60',
-	'knowledgeInformation' => 'urn:oid:2.5.4.2',
-	'l' => 'urn:oid:2.5.4.7',
-	'labeledURI' => 'urn:oid:1.3.6.1.4.1.250.1.57',
-	'localityName' => 'urn:oid:2.5.4.7',
-	'mDRecord' => 'urn:oid:0.9.2342.19200300.100.1.27',
-	'mXRecord' => 'urn:oid:0.9.2342.19200300.100.1.28',
-	'mail' => 'urn:oid:0.9.2342.19200300.100.1.3',
-	'mailPreferenceOption' => 'urn:oid:0.9.2342.19200300.100.1.47',
-	'manager' => 'urn:oid:0.9.2342.19200300.100.1.10',
-	'member' => 'urn:oid:2.5.4.31',
-	'mobile' => 'urn:oid:0.9.2342.19200300.100.1.41',
-	'mobileTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.41',
-	'nSRecord' => 'urn:oid:0.9.2342.19200300.100.1.29',
-	'name' => 'urn:oid:2.5.4.41',
-	'norEduOrgAcronym' => 'urn:oid:1.3.6.1.4.1.2428.90.1.6',
-	'norEduOrgNIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.12',
-	'norEduOrgSchemaVersion' => 'urn:oid:1.3.6.1.4.1.2428.90.1.11',
-	'norEduOrgUniqueIdentifier' => 'urn:oid:1.3.6.1.4.1.2428.90.1.7',
-	'norEduOrgUniqueNumber' => 'urn:oid:1.3.6.1.4.1.2428.90.1.1',
-	'norEduOrgUnitUniqueIdentifier' => 'urn:oid:1.3.6.1.4.1.2428.90.1.8',
-	'norEduOrgUnitUniqueNumber' => 'urn:oid:1.3.6.1.4.1.2428.90.1.2',
-	'norEduPersonBirthDate' => 'urn:oid:1.3.6.1.4.1.2428.90.1.3',
-	'norEduPersonLIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.4',
-	'norEduPersonNIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.5',
-	'o' => 'urn:oid:2.5.4.10',
-	'objectClass' => 'urn:oid:2.5.4.0',
-	'organizationName' => 'urn:oid:2.5.4.10',
-	'organizationalStatus' => 'urn:oid:0.9.2342.19200300.100.1.45',
-	'organizationalUnitName' => 'urn:oid:2.5.4.11',
-	'otherMailbox' => 'urn:oid:0.9.2342.19200300.100.1.22',
-	'ou' => 'urn:oid:2.5.4.11',
-	'owner' => 'urn:oid:2.5.4.32',
-	'pager' => 'urn:oid:0.9.2342.19200300.100.1.42',
-	'pagerTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.42',
-	'personalSignature' => 'urn:oid:0.9.2342.19200300.100.1.53',
-	'personalTitle' => 'urn:oid:0.9.2342.19200300.100.1.40',
-	'photo' => 'urn:oid:0.9.2342.19200300.100.1.7',
-	'physicalDeliveryOfficeName' => 'urn:oid:2.5.4.19',
-	'pkcs9email' => 'urn:oid:1.2.840.113549.1.9.1',
-	'postOfficeBox' => 'urn:oid:2.5.4.18',
-	'postalAddress' => 'urn:oid:2.5.4.16',
-	'postalCode' => 'urn:oid:2.5.4.17',
-	'preferredDeliveryMethod' => 'urn:oid:2.5.4.28',
-	'preferredLanguage' => 'urn:oid:2.16.840.1.113730.3.1.39',
-	'presentationAddress' => 'urn:oid:2.5.4.29',
-	'protocolInformation' => 'urn:oid:2.5.4.48',
-	'pseudonym' => 'urn:oid:2.5.4.65',
-	'registeredAddress' => 'urn:oid:2.5.4.26',
-	'rfc822Mailbox' => 'urn:oid:0.9.2342.19200300.100.1.3',
-	'roleOccupant' => 'urn:oid:2.5.4.33',
-	'roomNumber' => 'urn:oid:0.9.2342.19200300.100.1.6',
-	'sOARecord' => 'urn:oid:0.9.2342.19200300.100.1.30',
-	'schacCountryOfCitizenship' => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
-	'schacCountryOfResidence' => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
-	'schacDateOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
-	'schacExpiryDate' => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
-	'schacGender' => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
-	'schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
-	'schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
-	'schacMotherTongue' => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
-	'schacPersonalPosition' => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
-	'schacPersonalTitle' => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
-	'schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
-	'schacPersonalUniqueID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
-	'schacPlaceOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
-	'schacProjectMembership' => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
-	'schacProjectSpecificRole' => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
-	'schacSn1' => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
-	'schacSn2' => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
-	'schacUserPresenceID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
-	'schacUserPrivateAttribute' => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
-	'schacUserStatus' => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
-	'schacYearOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.0.2.3',
-	'searchGuide' => 'urn:oid:2.5.4.14',
-	'secretary' => 'urn:oid:0.9.2342.19200300.100.1.21',
-	'seeAlso' => 'urn:oid:2.5.4.34',
-	'serialNumber' => 'urn:oid:2.5.4.5',
-	'singleLevelQuality' => 'urn:oid:0.9.2342.19200300.100.1.50',
-	'sisSchoolGrade' => 'urn:oid:1.2.752.194.10.2.2',
-	'sisLegalGuardianFor' => 'urn:oid:1.2.752.194.10.2.1',
-	'sn' => 'urn:oid:2.5.4.4',
-	'st' => 'urn:oid:2.5.4.8',
-	'stateOrProvinceName' => 'urn:oid:2.5.4.8',
-	'street' => 'urn:oid:2.5.4.9',
-	'streetAddress' => 'urn:oid:2.5.4.9',
-	'subtreeMaximumQuality' => 'urn:oid:0.9.2342.19200300.100.1.52',
-	'subtreeMinimumQuality' => 'urn:oid:0.9.2342.19200300.100.1.51',
-	'supportedAlgorithms' => 'urn:oid:2.5.4.52',
-	'supportedApplicationContext' => 'urn:oid:2.5.4.30',
-	'surname' => 'urn:oid:2.5.4.4',
-	'telephoneNumber' => 'urn:oid:2.5.4.20',
-	'teletexTerminalIdentifier' => 'urn:oid:2.5.4.22',
-	'telexNumber' => 'urn:oid:2.5.4.21',
-	'textEncodedORAddress' => 'urn:oid:0.9.2342.19200300.100.1.2',
-	'title' => 'urn:oid:2.5.4.12',
-	'uid' => 'urn:oid:0.9.2342.19200300.100.1.1',
-	'uniqueIdentifier' => 'urn:oid:0.9.2342.19200300.100.1.44',
-	'uniqueMember' => 'urn:oid:2.5.4.50',
-	'userCertificate' => 'urn:oid:2.5.4.36',
-	'userClass' => 'urn:oid:0.9.2342.19200300.100.1.8',
-	'userPKCS12' => 'urn:oid:2.16.840.1.113730.3.1.216',
-	'userPassword' => 'urn:oid:2.5.4.35',
-	'userSMIMECertificate' => 'urn:oid:2.16.840.1.113730.3.1.40',
-	'userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
-	'x121Address' => 'urn:oid:2.5.4.24',
-	'x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
+    'aRecord'                       => 'urn:oid:0.9.2342.19200300.100.1.26',
+    'aliasedEntryName'              => 'urn:oid:2.5.4.1',
+    'aliasedObjectName'             => 'urn:oid:2.5.4.1',
+    'associatedDomain'              => 'urn:oid:0.9.2342.19200300.100.1.37',
+    'associatedName'                => 'urn:oid:0.9.2342.19200300.100.1.38',
+    'audio'                         => 'urn:oid:0.9.2342.19200300.100.1.55',
+    'authorityRevocationList'       => 'urn:oid:2.5.4.38',
+    'buildingName'                  => 'urn:oid:0.9.2342.19200300.100.1.48',
+    'businessCategory'              => 'urn:oid:2.5.4.15',
+    'c'                             => 'urn:oid:2.5.4.6',
+    'cACertificate'                 => 'urn:oid:2.5.4.37',
+    'cNAMERecord'                   => 'urn:oid:0.9.2342.19200300.100.1.31',
+    'carLicense'                    => 'urn:oid:2.16.840.1.113730.3.1.1',
+    'certificateRevocationList'     => 'urn:oid:2.5.4.39',
+    'cn'                            => 'urn:oid:2.5.4.3',
+    'co'                            => 'urn:oid:0.9.2342.19200300.100.1.43',
+    'commonName'                    => 'urn:oid:2.5.4.3',
+    'countryName'                   => 'urn:oid:2.5.4.6',
+    'crossCertificatePair'          => 'urn:oid:2.5.4.40',
+    'dITRedirect'                   => 'urn:oid:0.9.2342.19200300.100.1.54',
+    'dSAQuality'                    => 'urn:oid:0.9.2342.19200300.100.1.49',
+    'dc'                            => 'urn:oid:0.9.2342.19200300.100.1.25',
+    'deltaRevocationList'           => 'urn:oid:2.5.4.53',
+    'departmentNumber'              => 'urn:oid:2.16.840.1.113730.3.1.2',
+    'description'                   => 'urn:oid:2.5.4.13',
+    'destinationIndicator'          => 'urn:oid:2.5.4.27',
+    'displayName'                   => 'urn:oid:2.16.840.1.113730.3.1.241',
+    'distinguishedName'             => 'urn:oid:2.5.4.49',
+    'dmdName'                       => 'urn:oid:2.5.4.54',
+    'dnQualifier'                   => 'urn:oid:2.5.4.46',
+    'documentAuthor'                => 'urn:oid:0.9.2342.19200300.100.1.14',
+    'documentIdentifier'            => 'urn:oid:0.9.2342.19200300.100.1.11',
+    'documentLocation'              => 'urn:oid:0.9.2342.19200300.100.1.15',
+    'documentPublisher'             => 'urn:oid:0.9.2342.19200300.100.1.56',
+    'documentTitle'                 => 'urn:oid:0.9.2342.19200300.100.1.12',
+    'documentVersion'               => 'urn:oid:0.9.2342.19200300.100.1.13',
+    'domainComponent'               => 'urn:oid:0.9.2342.19200300.100.1.25',
+    'drink'                         => 'urn:oid:0.9.2342.19200300.100.1.5',
+    'eduOrgHomePageURI'             => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.2',
+    'eduOrgIdentityAuthNPolicyURI'  => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.3',
+    'eduOrgLegalName'               => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.4',
+    'eduOrgSuperiorURI'             => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.5',
+    'eduOrgWhitePagesURI'           => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.6',
+    'eduPersonAffiliation'          => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1',
+    'eduPersonAssurance'            => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
+    'eduPersonEntitlement'          => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
+    'eduPersonNickname'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
+    'eduPersonOrgDN'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
+    'eduPersonOrgUnitDN'            => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
+    'eduPersonPrimaryAffiliation'   => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
+    'eduPersonPrimaryOrgUnitDN'     => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.8',
+    'eduPersonPrincipalName'        => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6',
+    'eduPersonScopedAffiliation'    => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
+    'eduPersonTargetedID'           => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
+    'email'                         => 'urn:oid:1.2.840.113549.1.9.1',
+    'emailAddress'                  => 'urn:oid:1.2.840.113549.1.9.1',
+    'employeeNumber'                => 'urn:oid:2.16.840.1.113730.3.1.3',
+    'employeeType'                  => 'urn:oid:2.16.840.1.113730.3.1.4',
+    'enhancedSearchGuide'           => 'urn:oid:2.5.4.47',
+    'facsimileTelephoneNumber'      => 'urn:oid:2.5.4.23',
+    'favouriteDrink'                => 'urn:oid:0.9.2342.19200300.100.1.5',
+    'fax'                           => 'urn:oid:2.5.4.23',
+    'federationFeideSchemaVersion'  => 'urn:oid:1.3.6.1.4.1.2428.90.1.9',
+    'friendlyCountryName'           => 'urn:oid:0.9.2342.19200300.100.1.43',
+    'generationQualifier'           => 'urn:oid:2.5.4.44',
+    'givenName'                     => 'urn:oid:2.5.4.42',
+    'gn'                            => 'urn:oid:2.5.4.42',
+    'homePhone'                     => 'urn:oid:0.9.2342.19200300.100.1.20',
+    'homePostalAddress'             => 'urn:oid:0.9.2342.19200300.100.1.39',
+    'homeTelephoneNumber'           => 'urn:oid:0.9.2342.19200300.100.1.20',
+    'host'                          => 'urn:oid:0.9.2342.19200300.100.1.9',
+    'houseIdentifier'               => 'urn:oid:2.5.4.51',
+    'info'                          => 'urn:oid:0.9.2342.19200300.100.1.4',
+    'initials'                      => 'urn:oid:2.5.4.43',
+    'internationaliSDNNumber'       => 'urn:oid:2.5.4.25',
+    'isMemberOf'                    => 'urn:oid:1.3.6.1.4.1.5923.1.5.1.1',
+    'janetMailbox'                  => 'urn:oid:0.9.2342.19200300.100.1.46',
+    'jpegPhoto'                     => 'urn:oid:0.9.2342.19200300.100.1.60',
+    'knowledgeInformation'          => 'urn:oid:2.5.4.2',
+    'l'                             => 'urn:oid:2.5.4.7',
+    'labeledURI'                    => 'urn:oid:1.3.6.1.4.1.250.1.57',
+    'localityName'                  => 'urn:oid:2.5.4.7',
+    'mDRecord'                      => 'urn:oid:0.9.2342.19200300.100.1.27',
+    'mXRecord'                      => 'urn:oid:0.9.2342.19200300.100.1.28',
+    'mail'                          => 'urn:oid:0.9.2342.19200300.100.1.3',
+    'mailPreferenceOption'          => 'urn:oid:0.9.2342.19200300.100.1.47',
+    'manager'                       => 'urn:oid:0.9.2342.19200300.100.1.10',
+    'member'                        => 'urn:oid:2.5.4.31',
+    'mobile'                        => 'urn:oid:0.9.2342.19200300.100.1.41',
+    'mobileTelephoneNumber'         => 'urn:oid:0.9.2342.19200300.100.1.41',
+    'nSRecord'                      => 'urn:oid:0.9.2342.19200300.100.1.29',
+    'name'                          => 'urn:oid:2.5.4.41',
+    'norEduOrgAcronym'              => 'urn:oid:1.3.6.1.4.1.2428.90.1.6',
+    'norEduOrgNIN'                  => 'urn:oid:1.3.6.1.4.1.2428.90.1.12',
+    'norEduOrgSchemaVersion'        => 'urn:oid:1.3.6.1.4.1.2428.90.1.11',
+    'norEduOrgUniqueIdentifier'     => 'urn:oid:1.3.6.1.4.1.2428.90.1.7',
+    'norEduOrgUniqueNumber'         => 'urn:oid:1.3.6.1.4.1.2428.90.1.1',
+    'norEduOrgUnitUniqueIdentifier' => 'urn:oid:1.3.6.1.4.1.2428.90.1.8',
+    'norEduOrgUnitUniqueNumber'     => 'urn:oid:1.3.6.1.4.1.2428.90.1.2',
+    'norEduPersonBirthDate'         => 'urn:oid:1.3.6.1.4.1.2428.90.1.3',
+    'norEduPersonLIN'               => 'urn:oid:1.3.6.1.4.1.2428.90.1.4',
+    'norEduPersonNIN'               => 'urn:oid:1.3.6.1.4.1.2428.90.1.5',
+    'o'                             => 'urn:oid:2.5.4.10',
+    'objectClass'                   => 'urn:oid:2.5.4.0',
+    'organizationName'              => 'urn:oid:2.5.4.10',
+    'organizationalStatus'          => 'urn:oid:0.9.2342.19200300.100.1.45',
+    'organizationalUnitName'        => 'urn:oid:2.5.4.11',
+    'otherMailbox'                  => 'urn:oid:0.9.2342.19200300.100.1.22',
+    'ou'                            => 'urn:oid:2.5.4.11',
+    'owner'                         => 'urn:oid:2.5.4.32',
+    'pager'                         => 'urn:oid:0.9.2342.19200300.100.1.42',
+    'pagerTelephoneNumber'          => 'urn:oid:0.9.2342.19200300.100.1.42',
+    'personalSignature'             => 'urn:oid:0.9.2342.19200300.100.1.53',
+    'personalTitle'                 => 'urn:oid:0.9.2342.19200300.100.1.40',
+    'photo'                         => 'urn:oid:0.9.2342.19200300.100.1.7',
+    'physicalDeliveryOfficeName'    => 'urn:oid:2.5.4.19',
+    'pkcs9email'                    => 'urn:oid:1.2.840.113549.1.9.1',
+    'postOfficeBox'                 => 'urn:oid:2.5.4.18',
+    'postalAddress'                 => 'urn:oid:2.5.4.16',
+    'postalCode'                    => 'urn:oid:2.5.4.17',
+    'preferredDeliveryMethod'       => 'urn:oid:2.5.4.28',
+    'preferredLanguage'             => 'urn:oid:2.16.840.1.113730.3.1.39',
+    'presentationAddress'           => 'urn:oid:2.5.4.29',
+    'protocolInformation'           => 'urn:oid:2.5.4.48',
+    'pseudonym'                     => 'urn:oid:2.5.4.65',
+    'registeredAddress'             => 'urn:oid:2.5.4.26',
+    'rfc822Mailbox'                 => 'urn:oid:0.9.2342.19200300.100.1.3',
+    'roleOccupant'                  => 'urn:oid:2.5.4.33',
+    'roomNumber'                    => 'urn:oid:0.9.2342.19200300.100.1.6',
+    'sOARecord'                     => 'urn:oid:0.9.2342.19200300.100.1.30',
+    'schacCountryOfCitizenship'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
+    'schacCountryOfResidence'       => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
+    'schacDateOfBirth'              => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
+    'schacExpiryDate'               => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
+    'schacGender'                   => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
+    'schacHomeOrganization'         => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
+    'schacHomeOrganizationType'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
+    'schacMotherTongue'             => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
+    'schacPersonalPosition'         => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
+    'schacPersonalTitle'            => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
+    'schacPersonalUniqueCode'       => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
+    'schacPersonalUniqueID'         => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
+    'schacPlaceOfBirth'             => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
+    'schacProjectMembership'        => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
+    'schacProjectSpecificRole'      => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
+    'schacSn1'                      => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
+    'schacSn2'                      => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
+    'schacUserPresenceID'           => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
+    'schacUserPrivateAttribute'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
+    'schacUserStatus'               => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
+    'schacYearOfBirth'              => 'urn:oid:1.3.6.1.4.1.25178.1.0.2.3',
+    'searchGuide'                   => 'urn:oid:2.5.4.14',
+    'secretary'                     => 'urn:oid:0.9.2342.19200300.100.1.21',
+    'seeAlso'                       => 'urn:oid:2.5.4.34',
+    'serialNumber'                  => 'urn:oid:2.5.4.5',
+    'singleLevelQuality'            => 'urn:oid:0.9.2342.19200300.100.1.50',
+    'sisSchoolGrade'                => 'urn:oid:1.2.752.194.10.2.2',
+    'sisLegalGuardianFor'           => 'urn:oid:1.2.752.194.10.2.1',
+    'sn'                            => 'urn:oid:2.5.4.4',
+    'st'                            => 'urn:oid:2.5.4.8',
+    'stateOrProvinceName'           => 'urn:oid:2.5.4.8',
+    'street'                        => 'urn:oid:2.5.4.9',
+    'streetAddress'                 => 'urn:oid:2.5.4.9',
+    'subtreeMaximumQuality'         => 'urn:oid:0.9.2342.19200300.100.1.52',
+    'subtreeMinimumQuality'         => 'urn:oid:0.9.2342.19200300.100.1.51',
+    'supportedAlgorithms'           => 'urn:oid:2.5.4.52',
+    'supportedApplicationContext'   => 'urn:oid:2.5.4.30',
+    'surname'                       => 'urn:oid:2.5.4.4',
+    'telephoneNumber'               => 'urn:oid:2.5.4.20',
+    'teletexTerminalIdentifier'     => 'urn:oid:2.5.4.22',
+    'telexNumber'                   => 'urn:oid:2.5.4.21',
+    'textEncodedORAddress'          => 'urn:oid:0.9.2342.19200300.100.1.2',
+    'title'                         => 'urn:oid:2.5.4.12',
+    'uid'                           => 'urn:oid:0.9.2342.19200300.100.1.1',
+    'uniqueIdentifier'              => 'urn:oid:0.9.2342.19200300.100.1.44',
+    'uniqueMember'                  => 'urn:oid:2.5.4.50',
+    'userCertificate'               => 'urn:oid:2.5.4.36',
+    'userClass'                     => 'urn:oid:0.9.2342.19200300.100.1.8',
+    'userPKCS12'                    => 'urn:oid:2.16.840.1.113730.3.1.216',
+    'userPassword'                  => 'urn:oid:2.5.4.35',
+    'userSMIMECertificate'          => 'urn:oid:2.16.840.1.113730.3.1.40',
+    'userid'                        => 'urn:oid:0.9.2342.19200300.100.1.1',
+    'x121Address'                   => 'urn:oid:2.5.4.24',
+    'x500UniqueIdentifier'          => 'urn:oid:2.5.4.45',
 );
diff --git a/attributemap/name2urn.php b/attributemap/name2urn.php
index 799a338c0..f6d331b84 100644
--- a/attributemap/name2urn.php
+++ b/attributemap/name2urn.php
@@ -1,186 +1,186 @@
 <?php
 $attributemap = array(
-	'aRecord' => 'urn:mace:dir:attribute-def:aRecord',
-	'aliasedEntryName' => 'urn:mace:dir:attribute-def:aliasedEntryName',
-	'aliasedObjectName' => 'urn:mace:dir:attribute-def:aliasedObjectName',
-	'associatedDomain' => 'urn:mace:dir:attribute-def:associatedDomain',
-	'associatedName' => 'urn:mace:dir:attribute-def:associatedName',
-	'audio' => 'urn:mace:dir:attribute-def:audio',
-	'authorityRevocationList' => 'urn:mace:dir:attribute-def:authorityRevocationList',
-	'buildingName' => 'urn:mace:dir:attribute-def:buildingName',
-	'businessCategory' => 'urn:mace:dir:attribute-def:businessCategory',
-	'c' => 'urn:mace:dir:attribute-def:c',
-	'cACertificate' => 'urn:mace:dir:attribute-def:cACertificate',
-	'cNAMERecord' => 'urn:mace:dir:attribute-def:cNAMERecord',
-	'carLicense' => 'urn:mace:dir:attribute-def:carLicense',
-	'certificateRevocationList' => 'urn:mace:dir:attribute-def:certificateRevocationList',
-	'cn' => 'urn:mace:dir:attribute-def:cn',
-	'co' => 'urn:mace:dir:attribute-def:co',
-	'commonName' => 'urn:mace:dir:attribute-def:commonName',
-	'countryName' => 'urn:mace:dir:attribute-def:countryName',
-	'crossCertificatePair' => 'urn:mace:dir:attribute-def:crossCertificatePair',
-	'dITRedirect' => 'urn:mace:dir:attribute-def:dITRedirect',
-	'dSAQuality' => 'urn:mace:dir:attribute-def:dSAQuality',
-	'dc' => 'urn:mace:dir:attribute-def:dc',
-	'deltaRevocationList' => 'urn:mace:dir:attribute-def:deltaRevocationList',
-	'departmentNumber' => 'urn:mace:dir:attribute-def:departmentNumber',
-	'description' => 'urn:mace:dir:attribute-def:description',
-	'destinationIndicator' => 'urn:mace:dir:attribute-def:destinationIndicator',
-	'displayName' => 'urn:mace:dir:attribute-def:displayName',
-	'distinguishedName' => 'urn:mace:dir:attribute-def:distinguishedName',
-	'dmdName' => 'urn:mace:dir:attribute-def:dmdName',
-	'dnQualifier' => 'urn:mace:dir:attribute-def:dnQualifier',
-	'documentAuthor' => 'urn:mace:dir:attribute-def:documentAuthor',
-	'documentIdentifier' => 'urn:mace:dir:attribute-def:documentIdentifier',
-	'documentLocation' => 'urn:mace:dir:attribute-def:documentLocation',
-	'documentPublisher' => 'urn:mace:dir:attribute-def:documentPublisher',
-	'documentTitle' => 'urn:mace:dir:attribute-def:documentTitle',
-	'documentVersion' => 'urn:mace:dir:attribute-def:documentVersion',
-	'domainComponent' => 'urn:mace:dir:attribute-def:domainComponent',
-	'drink' => 'urn:mace:dir:attribute-def:drink',
-	'eduOrgHomePageURI' => 'urn:mace:dir:attribute-def:eduOrgHomePageURI',
-	'eduOrgIdentityAuthNPolicyURI' => 'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI',
-	'eduOrgLegalName' => 'urn:mace:dir:attribute-def:eduOrgLegalName',
-	'eduOrgSuperiorURI' => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
-	'eduOrgWhitePagesURI' => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
-	'eduPersonAffiliation' => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
-	'eduPersonAssurance' => 'urn:mace:dir:attribute-def:eduPersonAssurance',
-	'eduPersonEntitlement' => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
-	'eduPersonNickname' => 'urn:mace:dir:attribute-def:eduPersonNickname',
-	'eduPersonOrgDN' => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
-	'eduPersonOrgUnitDN' => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
-	'eduPersonPrimaryAffiliation' => 'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation',
-	'eduPersonPrimaryOrgUnitDN' => 'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN',
-	'eduPersonPrincipalName' => 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
-	'eduPersonScopedAffiliation' => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
-	'eduPersonTargetedID' => 'urn:mace:dir:attribute-def:eduPersonTargetedID',
-	'email' => 'urn:mace:dir:attribute-def:email',
-	'emailAddress' => 'urn:mace:dir:attribute-def:emailAddress',
-	'employeeNumber' => 'urn:mace:dir:attribute-def:employeeNumber',
-	'employeeType' => 'urn:mace:dir:attribute-def:employeeType',
-	'enhancedSearchGuide' => 'urn:mace:dir:attribute-def:enhancedSearchGuide',
-	'facsimileTelephoneNumber' => 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
-	'favouriteDrink' => 'urn:mace:dir:attribute-def:favouriteDrink',
-	'fax' => 'urn:mace:dir:attribute-def:fax',
-	'federationFeideSchemaVersion' => 'urn:mace:dir:attribute-def:federationFeideSchemaVersion',
-	'friendlyCountryName' => 'urn:mace:dir:attribute-def:friendlyCountryName',
-	'generationQualifier' => 'urn:mace:dir:attribute-def:generationQualifier',
-	'givenName' => 'urn:mace:dir:attribute-def:givenName',
-	'gn' => 'urn:mace:dir:attribute-def:gn',
-	'homePhone' => 'urn:mace:dir:attribute-def:homePhone',
-	'homePostalAddress' => 'urn:mace:dir:attribute-def:homePostalAddress',
-	'homeTelephoneNumber' => 'urn:mace:dir:attribute-def:homeTelephoneNumber',
-	'host' => 'urn:mace:dir:attribute-def:host',
-	'houseIdentifier' => 'urn:mace:dir:attribute-def:houseIdentifier',
-	'info' => 'urn:mace:dir:attribute-def:info',
-	'initials' => 'urn:mace:dir:attribute-def:initials',
-	'internationaliSDNNumber' => 'urn:mace:dir:attribute-def:internationaliSDNNumber',
-	'janetMailbox' => 'urn:mace:dir:attribute-def:janetMailbox',
-	'jpegPhoto' => 'urn:mace:dir:attribute-def:jpegPhoto',
-	'knowledgeInformation' => 'urn:mace:dir:attribute-def:knowledgeInformation',
-	'l' => 'urn:mace:dir:attribute-def:l',
-	'labeledURI' => 'urn:mace:dir:attribute-def:labeledURI',
-	'localityName' => 'urn:mace:dir:attribute-def:localityName',
-	'mDRecord' => 'urn:mace:dir:attribute-def:mDRecord',
-	'mXRecord' => 'urn:mace:dir:attribute-def:mXRecord',
-	'mail' => 'urn:mace:dir:attribute-def:mail',
-	'mailPreferenceOption' => 'urn:mace:dir:attribute-def:mailPreferenceOption',
-	'manager' => 'urn:mace:dir:attribute-def:manager',
-	'member' => 'urn:mace:dir:attribute-def:member',
-	'mobile' => 'urn:mace:dir:attribute-def:mobile',
-	'mobileTelephoneNumber' => 'urn:mace:dir:attribute-def:mobileTelephoneNumber',
-	'nSRecord' => 'urn:mace:dir:attribute-def:nSRecord',
-	'name' => 'urn:mace:dir:attribute-def:name',
-	'norEduOrgAcronym' => 'urn:mace:dir:attribute-def:norEduOrgAcronym',
-	'norEduOrgNIN' => 'urn:mace:dir:attribute-def:norEduOrgNIN',
-	'norEduOrgSchemaVersion' => 'urn:mace:dir:attribute-def:norEduOrgSchemaVersion',
-	'norEduOrgUniqueIdentifier' => 'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier',
-	'norEduOrgUniqueNumber' => 'urn:mace:dir:attribute-def:norEduOrgUniqueNumber',
-	'norEduOrgUnitUniqueIdentifier' => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier',
-	'norEduOrgUnitUniqueNumber' => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber',
-	'norEduPersonBirthDate' => 'urn:mace:dir:attribute-def:norEduPersonBirthDate',
-	'norEduPersonLIN' => 'urn:mace:dir:attribute-def:norEduPersonLIN',
-	'norEduPersonNIN' => 'urn:mace:dir:attribute-def:norEduPersonNIN',
-	'o' => 'urn:mace:dir:attribute-def:o',
-	'objectClass' => 'urn:mace:dir:attribute-def:objectClass',
-	'organizationName' => 'urn:mace:dir:attribute-def:organizationName',
-	'organizationalStatus' => 'urn:mace:dir:attribute-def:organizationalStatus',
-	'organizationalUnitName' => 'urn:mace:dir:attribute-def:organizationalUnitName',
-	'otherMailbox' => 'urn:mace:dir:attribute-def:otherMailbox',
-	'ou' => 'urn:mace:dir:attribute-def:ou',
-	'owner' => 'urn:mace:dir:attribute-def:owner',
-	'pager' => 'urn:mace:dir:attribute-def:pager',
-	'pagerTelephoneNumber' => 'urn:mace:dir:attribute-def:pagerTelephoneNumber',
-	'personalSignature' => 'urn:mace:dir:attribute-def:personalSignature',
-	'personalTitle' => 'urn:mace:dir:attribute-def:personalTitle',
-	'photo' => 'urn:mace:dir:attribute-def:photo',
-	'physicalDeliveryOfficeName' => 'urn:mace:dir:attribute-def:physicalDeliveryOfficeName',
-	'pkcs9email' => 'urn:mace:dir:attribute-def:pkcs9email',
-	'postOfficeBox' => 'urn:mace:dir:attribute-def:postOfficeBox',
-	'postalAddress' => 'urn:mace:dir:attribute-def:postalAddress',
-	'postalCode' => 'urn:mace:dir:attribute-def:postalCode',
-	'preferredDeliveryMethod' => 'urn:mace:dir:attribute-def:preferredDeliveryMethod',
-	'preferredLanguage' => 'urn:mace:dir:attribute-def:preferredLanguage',
-	'presentationAddress' => 'urn:mace:dir:attribute-def:presentationAddress',
-	'protocolInformation' => 'urn:mace:dir:attribute-def:protocolInformation',
-	'pseudonym' => 'urn:mace:dir:attribute-def:pseudonym',
-	'registeredAddress' => 'urn:mace:dir:attribute-def:registeredAddress',
-	'rfc822Mailbox' => 'urn:mace:dir:attribute-def:rfc822Mailbox',
-	'roleOccupant' => 'urn:mace:dir:attribute-def:roleOccupant',
-	'roomNumber' => 'urn:mace:dir:attribute-def:roomNumber',
-	'sOARecord' => 'urn:mace:dir:attribute-def:sOARecord',
-	'schacCountryOfCitizenship' => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
-	'schacCountryOfResidence' => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
-	'schacDateOfBirth' => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
-	'schacExpiryDate' => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
-	'schacGender' => 'urn:mace:terena.org:attribute-def:schacGender',
-	'schacHomeOrganization' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
-	'schacHomeOrganizationType' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
-	'schacMotherTongue' => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
-	'schacPersonalPosition' => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
-	'schacPersonalTitle' => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
-	'schacPersonalUniqueCode' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
-	'schacPersonalUniqueID' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
-	'schacPlaceOfBirth' => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
-	'schacProjectMembership' => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
-	'schacProjectSpecificRole' => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
-	'schacSn1' => 'urn:mace:terena.org:attribute-def:schacSn1',
-	'schacSn2' => 'urn:mace:terena.org:attribute-def:schacSn2',
-	'schacUserPresenceID' => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
-	'schacUserPrivateAttribute' => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
-	'schacUserStatus' => 'urn:mace:terena.org:attribute-def:schacUserStatus',
-	'schacYearOfBirth' => 'urn:mace:terena.org:attribute-def:schacYearOfBirth',
-	'searchGuide' => 'urn:mace:dir:attribute-def:searchGuide',
-	'secretary' => 'urn:mace:dir:attribute-def:secretary',
-	'seeAlso' => 'urn:mace:dir:attribute-def:seeAlso',
-	'serialNumber' => 'urn:mace:dir:attribute-def:serialNumber',
-	'singleLevelQuality' => 'urn:mace:dir:attribute-def:singleLevelQuality',
-	'sisSchoolGrade' => 'urn:mace:dir:attribute-def:sisSchoolGrade',
-	'sisLegalGuardianFor' => 'urn:mace:dir:attribute-def:sisLegalGuardianFor',
-	'sn' => 'urn:mace:dir:attribute-def:sn',
-	'st' => 'urn:mace:dir:attribute-def:st',
-	'stateOrProvinceName' => 'urn:mace:dir:attribute-def:stateOrProvinceName',
-	'street' => 'urn:mace:dir:attribute-def:street',
-	'streetAddress' => 'urn:mace:dir:attribute-def:streetAddress',
-	'subtreeMaximumQuality' => 'urn:mace:dir:attribute-def:subtreeMaximumQuality',
-	'subtreeMinimumQuality' => 'urn:mace:dir:attribute-def:subtreeMinimumQuality',
-	'supportedAlgorithms' => 'urn:mace:dir:attribute-def:supportedAlgorithms',
-	'supportedApplicationContext' => 'urn:mace:dir:attribute-def:supportedApplicationContext',
-	'surname' => 'urn:mace:dir:attribute-def:surname',
-	'telephoneNumber' => 'urn:mace:dir:attribute-def:telephoneNumber',
-	'teletexTerminalIdentifier' => 'urn:mace:dir:attribute-def:teletexTerminalIdentifier',
-	'telexNumber' => 'urn:mace:dir:attribute-def:telexNumber',
-	'textEncodedORAddress' => 'urn:mace:dir:attribute-def:textEncodedORAddress',
-	'title' => 'urn:mace:dir:attribute-def:title',
-	'uid' => 'urn:mace:dir:attribute-def:uid',
-	'uniqueIdentifier' => 'urn:mace:dir:attribute-def:uniqueIdentifier',
-	'uniqueMember' => 'urn:mace:dir:attribute-def:uniqueMember',
-	'userCertificate' => 'urn:mace:dir:attribute-def:userCertificate',
-	'userClass' => 'urn:mace:dir:attribute-def:userClass',
-	'userPKCS12' => 'urn:mace:dir:attribute-def:userPKCS12',
-	'userPassword' => 'urn:mace:dir:attribute-def:userPassword',
-	'userSMIMECertificate' => 'urn:mace:dir:attribute-def:userSMIMECertificate',
-	'userid' => 'urn:mace:dir:attribute-def:userid',
-	'x121Address' => 'urn:mace:dir:attribute-def:x121Address',
-	'x500UniqueIdentifier' => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
+    'aRecord'                       => 'urn:mace:dir:attribute-def:aRecord',
+    'aliasedEntryName'              => 'urn:mace:dir:attribute-def:aliasedEntryName',
+    'aliasedObjectName'             => 'urn:mace:dir:attribute-def:aliasedObjectName',
+    'associatedDomain'              => 'urn:mace:dir:attribute-def:associatedDomain',
+    'associatedName'                => 'urn:mace:dir:attribute-def:associatedName',
+    'audio'                         => 'urn:mace:dir:attribute-def:audio',
+    'authorityRevocationList'       => 'urn:mace:dir:attribute-def:authorityRevocationList',
+    'buildingName'                  => 'urn:mace:dir:attribute-def:buildingName',
+    'businessCategory'              => 'urn:mace:dir:attribute-def:businessCategory',
+    'c'                             => 'urn:mace:dir:attribute-def:c',
+    'cACertificate'                 => 'urn:mace:dir:attribute-def:cACertificate',
+    'cNAMERecord'                   => 'urn:mace:dir:attribute-def:cNAMERecord',
+    'carLicense'                    => 'urn:mace:dir:attribute-def:carLicense',
+    'certificateRevocationList'     => 'urn:mace:dir:attribute-def:certificateRevocationList',
+    'cn'                            => 'urn:mace:dir:attribute-def:cn',
+    'co'                            => 'urn:mace:dir:attribute-def:co',
+    'commonName'                    => 'urn:mace:dir:attribute-def:commonName',
+    'countryName'                   => 'urn:mace:dir:attribute-def:countryName',
+    'crossCertificatePair'          => 'urn:mace:dir:attribute-def:crossCertificatePair',
+    'dITRedirect'                   => 'urn:mace:dir:attribute-def:dITRedirect',
+    'dSAQuality'                    => 'urn:mace:dir:attribute-def:dSAQuality',
+    'dc'                            => 'urn:mace:dir:attribute-def:dc',
+    'deltaRevocationList'           => 'urn:mace:dir:attribute-def:deltaRevocationList',
+    'departmentNumber'              => 'urn:mace:dir:attribute-def:departmentNumber',
+    'description'                   => 'urn:mace:dir:attribute-def:description',
+    'destinationIndicator'          => 'urn:mace:dir:attribute-def:destinationIndicator',
+    'displayName'                   => 'urn:mace:dir:attribute-def:displayName',
+    'distinguishedName'             => 'urn:mace:dir:attribute-def:distinguishedName',
+    'dmdName'                       => 'urn:mace:dir:attribute-def:dmdName',
+    'dnQualifier'                   => 'urn:mace:dir:attribute-def:dnQualifier',
+    'documentAuthor'                => 'urn:mace:dir:attribute-def:documentAuthor',
+    'documentIdentifier'            => 'urn:mace:dir:attribute-def:documentIdentifier',
+    'documentLocation'              => 'urn:mace:dir:attribute-def:documentLocation',
+    'documentPublisher'             => 'urn:mace:dir:attribute-def:documentPublisher',
+    'documentTitle'                 => 'urn:mace:dir:attribute-def:documentTitle',
+    'documentVersion'               => 'urn:mace:dir:attribute-def:documentVersion',
+    'domainComponent'               => 'urn:mace:dir:attribute-def:domainComponent',
+    'drink'                         => 'urn:mace:dir:attribute-def:drink',
+    'eduOrgHomePageURI'             => 'urn:mace:dir:attribute-def:eduOrgHomePageURI',
+    'eduOrgIdentityAuthNPolicyURI'  => 'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI',
+    'eduOrgLegalName'               => 'urn:mace:dir:attribute-def:eduOrgLegalName',
+    'eduOrgSuperiorURI'             => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
+    'eduOrgWhitePagesURI'           => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
+    'eduPersonAffiliation'          => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
+    'eduPersonAssurance'            => 'urn:mace:dir:attribute-def:eduPersonAssurance',
+    'eduPersonEntitlement'          => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
+    'eduPersonNickname'             => 'urn:mace:dir:attribute-def:eduPersonNickname',
+    'eduPersonOrgDN'                => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
+    'eduPersonOrgUnitDN'            => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
+    'eduPersonPrimaryAffiliation'   => 'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation',
+    'eduPersonPrimaryOrgUnitDN'     => 'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN',
+    'eduPersonPrincipalName'        => 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
+    'eduPersonScopedAffiliation'    => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
+    'eduPersonTargetedID'           => 'urn:mace:dir:attribute-def:eduPersonTargetedID',
+    'email'                         => 'urn:mace:dir:attribute-def:email',
+    'emailAddress'                  => 'urn:mace:dir:attribute-def:emailAddress',
+    'employeeNumber'                => 'urn:mace:dir:attribute-def:employeeNumber',
+    'employeeType'                  => 'urn:mace:dir:attribute-def:employeeType',
+    'enhancedSearchGuide'           => 'urn:mace:dir:attribute-def:enhancedSearchGuide',
+    'facsimileTelephoneNumber'      => 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
+    'favouriteDrink'                => 'urn:mace:dir:attribute-def:favouriteDrink',
+    'fax'                           => 'urn:mace:dir:attribute-def:fax',
+    'federationFeideSchemaVersion'  => 'urn:mace:dir:attribute-def:federationFeideSchemaVersion',
+    'friendlyCountryName'           => 'urn:mace:dir:attribute-def:friendlyCountryName',
+    'generationQualifier'           => 'urn:mace:dir:attribute-def:generationQualifier',
+    'givenName'                     => 'urn:mace:dir:attribute-def:givenName',
+    'gn'                            => 'urn:mace:dir:attribute-def:gn',
+    'homePhone'                     => 'urn:mace:dir:attribute-def:homePhone',
+    'homePostalAddress'             => 'urn:mace:dir:attribute-def:homePostalAddress',
+    'homeTelephoneNumber'           => 'urn:mace:dir:attribute-def:homeTelephoneNumber',
+    'host'                          => 'urn:mace:dir:attribute-def:host',
+    'houseIdentifier'               => 'urn:mace:dir:attribute-def:houseIdentifier',
+    'info'                          => 'urn:mace:dir:attribute-def:info',
+    'initials'                      => 'urn:mace:dir:attribute-def:initials',
+    'internationaliSDNNumber'       => 'urn:mace:dir:attribute-def:internationaliSDNNumber',
+    'janetMailbox'                  => 'urn:mace:dir:attribute-def:janetMailbox',
+    'jpegPhoto'                     => 'urn:mace:dir:attribute-def:jpegPhoto',
+    'knowledgeInformation'          => 'urn:mace:dir:attribute-def:knowledgeInformation',
+    'l'                             => 'urn:mace:dir:attribute-def:l',
+    'labeledURI'                    => 'urn:mace:dir:attribute-def:labeledURI',
+    'localityName'                  => 'urn:mace:dir:attribute-def:localityName',
+    'mDRecord'                      => 'urn:mace:dir:attribute-def:mDRecord',
+    'mXRecord'                      => 'urn:mace:dir:attribute-def:mXRecord',
+    'mail'                          => 'urn:mace:dir:attribute-def:mail',
+    'mailPreferenceOption'          => 'urn:mace:dir:attribute-def:mailPreferenceOption',
+    'manager'                       => 'urn:mace:dir:attribute-def:manager',
+    'member'                        => 'urn:mace:dir:attribute-def:member',
+    'mobile'                        => 'urn:mace:dir:attribute-def:mobile',
+    'mobileTelephoneNumber'         => 'urn:mace:dir:attribute-def:mobileTelephoneNumber',
+    'nSRecord'                      => 'urn:mace:dir:attribute-def:nSRecord',
+    'name'                          => 'urn:mace:dir:attribute-def:name',
+    'norEduOrgAcronym'              => 'urn:mace:dir:attribute-def:norEduOrgAcronym',
+    'norEduOrgNIN'                  => 'urn:mace:dir:attribute-def:norEduOrgNIN',
+    'norEduOrgSchemaVersion'        => 'urn:mace:dir:attribute-def:norEduOrgSchemaVersion',
+    'norEduOrgUniqueIdentifier'     => 'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier',
+    'norEduOrgUniqueNumber'         => 'urn:mace:dir:attribute-def:norEduOrgUniqueNumber',
+    'norEduOrgUnitUniqueIdentifier' => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier',
+    'norEduOrgUnitUniqueNumber'     => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber',
+    'norEduPersonBirthDate'         => 'urn:mace:dir:attribute-def:norEduPersonBirthDate',
+    'norEduPersonLIN'               => 'urn:mace:dir:attribute-def:norEduPersonLIN',
+    'norEduPersonNIN'               => 'urn:mace:dir:attribute-def:norEduPersonNIN',
+    'o'                             => 'urn:mace:dir:attribute-def:o',
+    'objectClass'                   => 'urn:mace:dir:attribute-def:objectClass',
+    'organizationName'              => 'urn:mace:dir:attribute-def:organizationName',
+    'organizationalStatus'          => 'urn:mace:dir:attribute-def:organizationalStatus',
+    'organizationalUnitName'        => 'urn:mace:dir:attribute-def:organizationalUnitName',
+    'otherMailbox'                  => 'urn:mace:dir:attribute-def:otherMailbox',
+    'ou'                            => 'urn:mace:dir:attribute-def:ou',
+    'owner'                         => 'urn:mace:dir:attribute-def:owner',
+    'pager'                         => 'urn:mace:dir:attribute-def:pager',
+    'pagerTelephoneNumber'          => 'urn:mace:dir:attribute-def:pagerTelephoneNumber',
+    'personalSignature'             => 'urn:mace:dir:attribute-def:personalSignature',
+    'personalTitle'                 => 'urn:mace:dir:attribute-def:personalTitle',
+    'photo'                         => 'urn:mace:dir:attribute-def:photo',
+    'physicalDeliveryOfficeName'    => 'urn:mace:dir:attribute-def:physicalDeliveryOfficeName',
+    'pkcs9email'                    => 'urn:mace:dir:attribute-def:pkcs9email',
+    'postOfficeBox'                 => 'urn:mace:dir:attribute-def:postOfficeBox',
+    'postalAddress'                 => 'urn:mace:dir:attribute-def:postalAddress',
+    'postalCode'                    => 'urn:mace:dir:attribute-def:postalCode',
+    'preferredDeliveryMethod'       => 'urn:mace:dir:attribute-def:preferredDeliveryMethod',
+    'preferredLanguage'             => 'urn:mace:dir:attribute-def:preferredLanguage',
+    'presentationAddress'           => 'urn:mace:dir:attribute-def:presentationAddress',
+    'protocolInformation'           => 'urn:mace:dir:attribute-def:protocolInformation',
+    'pseudonym'                     => 'urn:mace:dir:attribute-def:pseudonym',
+    'registeredAddress'             => 'urn:mace:dir:attribute-def:registeredAddress',
+    'rfc822Mailbox'                 => 'urn:mace:dir:attribute-def:rfc822Mailbox',
+    'roleOccupant'                  => 'urn:mace:dir:attribute-def:roleOccupant',
+    'roomNumber'                    => 'urn:mace:dir:attribute-def:roomNumber',
+    'sOARecord'                     => 'urn:mace:dir:attribute-def:sOARecord',
+    'schacCountryOfCitizenship'     => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
+    'schacCountryOfResidence'       => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
+    'schacDateOfBirth'              => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
+    'schacExpiryDate'               => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
+    'schacGender'                   => 'urn:mace:terena.org:attribute-def:schacGender',
+    'schacHomeOrganization'         => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
+    'schacHomeOrganizationType'     => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
+    'schacMotherTongue'             => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
+    'schacPersonalPosition'         => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
+    'schacPersonalTitle'            => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
+    'schacPersonalUniqueCode'       => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
+    'schacPersonalUniqueID'         => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
+    'schacPlaceOfBirth'             => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
+    'schacProjectMembership'        => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
+    'schacProjectSpecificRole'      => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
+    'schacSn1'                      => 'urn:mace:terena.org:attribute-def:schacSn1',
+    'schacSn2'                      => 'urn:mace:terena.org:attribute-def:schacSn2',
+    'schacUserPresenceID'           => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
+    'schacUserPrivateAttribute'     => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
+    'schacUserStatus'               => 'urn:mace:terena.org:attribute-def:schacUserStatus',
+    'schacYearOfBirth'              => 'urn:mace:terena.org:attribute-def:schacYearOfBirth',
+    'searchGuide'                   => 'urn:mace:dir:attribute-def:searchGuide',
+    'secretary'                     => 'urn:mace:dir:attribute-def:secretary',
+    'seeAlso'                       => 'urn:mace:dir:attribute-def:seeAlso',
+    'serialNumber'                  => 'urn:mace:dir:attribute-def:serialNumber',
+    'singleLevelQuality'            => 'urn:mace:dir:attribute-def:singleLevelQuality',
+    'sisSchoolGrade'                => 'urn:mace:dir:attribute-def:sisSchoolGrade',
+    'sisLegalGuardianFor'           => 'urn:mace:dir:attribute-def:sisLegalGuardianFor',
+    'sn'                            => 'urn:mace:dir:attribute-def:sn',
+    'st'                            => 'urn:mace:dir:attribute-def:st',
+    'stateOrProvinceName'           => 'urn:mace:dir:attribute-def:stateOrProvinceName',
+    'street'                        => 'urn:mace:dir:attribute-def:street',
+    'streetAddress'                 => 'urn:mace:dir:attribute-def:streetAddress',
+    'subtreeMaximumQuality'         => 'urn:mace:dir:attribute-def:subtreeMaximumQuality',
+    'subtreeMinimumQuality'         => 'urn:mace:dir:attribute-def:subtreeMinimumQuality',
+    'supportedAlgorithms'           => 'urn:mace:dir:attribute-def:supportedAlgorithms',
+    'supportedApplicationContext'   => 'urn:mace:dir:attribute-def:supportedApplicationContext',
+    'surname'                       => 'urn:mace:dir:attribute-def:surname',
+    'telephoneNumber'               => 'urn:mace:dir:attribute-def:telephoneNumber',
+    'teletexTerminalIdentifier'     => 'urn:mace:dir:attribute-def:teletexTerminalIdentifier',
+    'telexNumber'                   => 'urn:mace:dir:attribute-def:telexNumber',
+    'textEncodedORAddress'          => 'urn:mace:dir:attribute-def:textEncodedORAddress',
+    'title'                         => 'urn:mace:dir:attribute-def:title',
+    'uid'                           => 'urn:mace:dir:attribute-def:uid',
+    'uniqueIdentifier'              => 'urn:mace:dir:attribute-def:uniqueIdentifier',
+    'uniqueMember'                  => 'urn:mace:dir:attribute-def:uniqueMember',
+    'userCertificate'               => 'urn:mace:dir:attribute-def:userCertificate',
+    'userClass'                     => 'urn:mace:dir:attribute-def:userClass',
+    'userPKCS12'                    => 'urn:mace:dir:attribute-def:userPKCS12',
+    'userPassword'                  => 'urn:mace:dir:attribute-def:userPassword',
+    'userSMIMECertificate'          => 'urn:mace:dir:attribute-def:userSMIMECertificate',
+    'userid'                        => 'urn:mace:dir:attribute-def:userid',
+    'x121Address'                   => 'urn:mace:dir:attribute-def:x121Address',
+    'x500UniqueIdentifier'          => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
 );
diff --git a/attributemap/oid-feide.php b/attributemap/oid-feide.php
index 7d9c9d0d1..e20b7a885 100644
--- a/attributemap/oid-feide.php
+++ b/attributemap/oid-feide.php
@@ -1,12 +1,12 @@
 <?php
 
 $attributemap = array(
-	'urn:oid:0.9.2342.19200300.100.1.41'	=> 'mobile',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.6' 		=> 'eduPersonPrincipalName',
-	'urn:oid:0.9.2342.19200300.100.1.3' 	=> 'mail',
-	'urn:oid:2.5.4.3' 						=> 'cn',
-	'urn:oid:2.16.840.1.113730.3.1.241' 	=> 'displayName',
-	'urn:oid:2.5.4.4' => 'sn',
-	'urn:oid:2.5.4.42' => 'givenName',
-	'urn:oid:2.16.756.1.2.5.1.1.1' => 'eduPerson',
+    'urn:oid:0.9.2342.19200300.100.1.41' => 'mobile',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.6'   => 'eduPersonPrincipalName',
+    'urn:oid:0.9.2342.19200300.100.1.3'  => 'mail',
+    'urn:oid:2.5.4.3'                    => 'cn',
+    'urn:oid:2.16.840.1.113730.3.1.241'  => 'displayName',
+    'urn:oid:2.5.4.4'                    => 'sn',
+    'urn:oid:2.5.4.42'                   => 'givenName',
+    'urn:oid:2.16.756.1.2.5.1.1.1'       => 'eduPerson',
 );
diff --git a/attributemap/oid2name.php b/attributemap/oid2name.php
index e38ca344e..33c26a9ef 100644
--- a/attributemap/oid2name.php
+++ b/attributemap/oid2name.php
@@ -1,165 +1,165 @@
 <?php
 $attributemap = array(
-	'urn:oid:0.9.2342.19200300.100.1.1' => 'uid',
-	'urn:oid:0.9.2342.19200300.100.1.10' => 'manager',
-	'urn:oid:0.9.2342.19200300.100.1.11' => 'documentIdentifier',
-	'urn:oid:0.9.2342.19200300.100.1.12' => 'documentTitle',
-	'urn:oid:0.9.2342.19200300.100.1.13' => 'documentVersion',
-	'urn:oid:0.9.2342.19200300.100.1.14' => 'documentAuthor',
-	'urn:oid:0.9.2342.19200300.100.1.15' => 'documentLocation',
-	'urn:oid:0.9.2342.19200300.100.1.2' => 'textEncodedORAddress',
-	'urn:oid:0.9.2342.19200300.100.1.20' => 'homePhone',
-	'urn:oid:0.9.2342.19200300.100.1.21' => 'secretary',
-	'urn:oid:0.9.2342.19200300.100.1.22' => 'otherMailbox',
-	'urn:oid:0.9.2342.19200300.100.1.25' => 'dc',
-	'urn:oid:0.9.2342.19200300.100.1.26' => 'aRecord',
-	'urn:oid:0.9.2342.19200300.100.1.27' => 'mDRecord',
-	'urn:oid:0.9.2342.19200300.100.1.28' => 'mXRecord',
-	'urn:oid:0.9.2342.19200300.100.1.29' => 'nSRecord',
-	'urn:oid:0.9.2342.19200300.100.1.3' => 'mail',
-	'urn:oid:0.9.2342.19200300.100.1.30' => 'sOARecord',
-	'urn:oid:0.9.2342.19200300.100.1.31' => 'cNAMERecord',
-	'urn:oid:0.9.2342.19200300.100.1.37' => 'associatedDomain',
-	'urn:oid:0.9.2342.19200300.100.1.38' => 'associatedName',
-	'urn:oid:0.9.2342.19200300.100.1.39' => 'homePostalAddress',
-	'urn:oid:0.9.2342.19200300.100.1.4' => 'info',
-	'urn:oid:0.9.2342.19200300.100.1.40' => 'personalTitle',
-	'urn:oid:0.9.2342.19200300.100.1.41' => 'mobile',
-	'urn:oid:0.9.2342.19200300.100.1.42' => 'pager',
-	'urn:oid:0.9.2342.19200300.100.1.43' => 'co',
-	'urn:oid:0.9.2342.19200300.100.1.44' => 'uniqueIdentifier',
-	'urn:oid:0.9.2342.19200300.100.1.45' => 'organizationalStatus',
-	'urn:oid:0.9.2342.19200300.100.1.46' => 'janetMailbox',
-	'urn:oid:0.9.2342.19200300.100.1.47' => 'mailPreferenceOption',
-	'urn:oid:0.9.2342.19200300.100.1.48' => 'buildingName',
-	'urn:oid:0.9.2342.19200300.100.1.49' => 'dSAQuality',
-	'urn:oid:0.9.2342.19200300.100.1.5' => 'drink',
-	'urn:oid:0.9.2342.19200300.100.1.50' => 'singleLevelQuality',
-	'urn:oid:0.9.2342.19200300.100.1.51' => 'subtreeMinimumQuality',
-	'urn:oid:0.9.2342.19200300.100.1.52' => 'subtreeMaximumQuality',
-	'urn:oid:0.9.2342.19200300.100.1.53' => 'personalSignature',
-	'urn:oid:0.9.2342.19200300.100.1.54' => 'dITRedirect',
-	'urn:oid:0.9.2342.19200300.100.1.55' => 'audio',
-	'urn:oid:0.9.2342.19200300.100.1.56' => 'documentPublisher',
-	'urn:oid:0.9.2342.19200300.100.1.6' => 'roomNumber',
-	'urn:oid:0.9.2342.19200300.100.1.60' => 'jpegPhoto',
-	'urn:oid:0.9.2342.19200300.100.1.7' => 'photo',
-	'urn:oid:0.9.2342.19200300.100.1.8' => 'userClass',
-	'urn:oid:0.9.2342.19200300.100.1.9' => 'host',
-	'urn:oid:1.2.840.113549.1.9.1' => 'email',
-	'urn:oid:1.2.752.194.10.2.2' => 'sisSchoolGrade',
-	'urn:oid:1.2.752.194.10.2.1' => 'sisLegalGuardianFor',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.1' => 'norEduOrgUniqueNumber',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.11' => 'norEduOrgSchemaVersion',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.12' => 'norEduOrgNIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.2' => 'norEduOrgUnitUniqueNumber',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.3' => 'norEduPersonBirthDate',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.4' => 'norEduPersonLIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.5' => 'norEduPersonNIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.6' => 'norEduOrgAcronym',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.7' => 'norEduOrgUniqueIdentifier',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.8' => 'norEduOrgUnitUniqueIdentifier',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.9' => 'federationFeideSchemaVersion',
-	'urn:oid:1.3.6.1.4.1.250.1.57' => 'labeledURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.1' => 'eduPersonAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.11' => 'eduPersonAssurance',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.10' => 'eduPersonTargetedID',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.2' => 'eduPersonNickname',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.3' => 'eduPersonOrgDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.4' => 'eduPersonOrgUnitDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.5' => 'eduPersonPrimaryAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.6' => 'eduPersonPrincipalName',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.7' => 'eduPersonEntitlement',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.8' => 'eduPersonPrimaryOrgUnitDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.9' => 'eduPersonScopedAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.2' => 'eduOrgHomePageURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.3' => 'eduOrgIdentityAuthNPolicyURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.4' => 'eduOrgLegalName',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.5' => 'eduOrgSuperiorURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.6' => 'eduOrgWhitePagesURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.5.1.1' => 'isMemberOf',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.1' => 'schacMotherTongue',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'schacGender',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.3' => 'schacDateOfBirth',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.4' => 'schacPlaceOfBirth',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.5' => 'schacCountryOfCitizenship',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.6' => 'schacSn1',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.7' => 'schacSn2',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.8' => 'schacPersonalTitle',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'schacHomeOrganization',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'schacHomeOrganizationType',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.11' => 'schacCountryOfResidence',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.12' => 'schacUserPresenceID',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.13' => 'schacPersonalPosition',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'schacPersonalUniqueCode',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.15' => 'schacPersonalUniqueID',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.17' => 'schacExpiryDate',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.18' => 'schacUserPrivateAttribute',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.19' => 'schacUserStatus',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.20' => 'schacProjectMembership',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.21' => 'schacProjectSpecificRole',
-	'urn:oid:2.16.840.1.113730.3.1.1' => 'carLicense',
-	'urn:oid:2.16.840.1.113730.3.1.2' => 'departmentNumber',
-	'urn:oid:2.16.840.1.113730.3.1.216' => 'userPKCS12',
-	'urn:oid:2.16.840.1.113730.3.1.241' => 'displayName',
-	'urn:oid:2.16.840.1.113730.3.1.3' => 'employeeNumber',
-	'urn:oid:2.16.840.1.113730.3.1.39' => 'preferredLanguage',
-	'urn:oid:2.16.840.1.113730.3.1.4' => 'employeeType',
-	'urn:oid:2.16.840.1.113730.3.1.40' => 'userSMIMECertificate',
-	'urn:oid:2.5.4.0' => 'objectClass',
-	'urn:oid:2.5.4.1' => 'aliasedObjectName',
-	'urn:oid:2.5.4.10' => 'o',
-	'urn:oid:2.5.4.11' => 'ou',
-	'urn:oid:2.5.4.12' => 'title',
-	'urn:oid:2.5.4.13' => 'description',
-	'urn:oid:2.5.4.14' => 'searchGuide',
-	'urn:oid:2.5.4.15' => 'businessCategory',
-	'urn:oid:2.5.4.16' => 'postalAddress',
-	'urn:oid:2.5.4.17' => 'postalCode',
-	'urn:oid:2.5.4.18' => 'postOfficeBox',
-	'urn:oid:2.5.4.19' => 'physicalDeliveryOfficeName',
-	'urn:oid:2.5.4.2' => 'knowledgeInformation',
-	'urn:oid:2.5.4.20' => 'telephoneNumber',
-	'urn:oid:2.5.4.21' => 'telexNumber',
-	'urn:oid:2.5.4.22' => 'teletexTerminalIdentifier',
-	'urn:oid:2.5.4.23' => 'facsimileTelephoneNumber',
-	'urn:oid:2.5.4.24' => 'x121Address',
-	'urn:oid:2.5.4.25' => 'internationaliSDNNumber',
-	'urn:oid:2.5.4.26' => 'registeredAddress',
-	'urn:oid:2.5.4.27' => 'destinationIndicator',
-	'urn:oid:2.5.4.28' => 'preferredDeliveryMethod',
-	'urn:oid:2.5.4.29' => 'presentationAddress',
-	'urn:oid:2.5.4.3' => 'cn',
-	'urn:oid:2.5.4.30' => 'supportedApplicationContext',
-	'urn:oid:2.5.4.31' => 'member',
-	'urn:oid:2.5.4.32' => 'owner',
-	'urn:oid:2.5.4.33' => 'roleOccupant',
-	'urn:oid:2.5.4.34' => 'seeAlso',
-	'urn:oid:2.5.4.35' => 'userPassword',
-	'urn:oid:2.5.4.36' => 'userCertificate',
-	'urn:oid:2.5.4.37' => 'cACertificate',
-	'urn:oid:2.5.4.38' => 'authorityRevocationList',
-	'urn:oid:2.5.4.39' => 'certificateRevocationList',
-	'urn:oid:2.5.4.4' => 'sn',
-	'urn:oid:2.5.4.40' => 'crossCertificatePair',
-	'urn:oid:2.5.4.41' => 'name',
-	'urn:oid:2.5.4.42' => 'givenName',
-	'urn:oid:2.5.4.43' => 'initials',
-	'urn:oid:2.5.4.44' => 'generationQualifier',
-	'urn:oid:2.5.4.45' => 'x500UniqueIdentifier',
-	'urn:oid:2.5.4.46' => 'dnQualifier',
-	'urn:oid:2.5.4.47' => 'enhancedSearchGuide',
-	'urn:oid:2.5.4.48' => 'protocolInformation',
-	'urn:oid:2.5.4.49' => 'distinguishedName',
-	'urn:oid:2.5.4.5' => 'serialNumber',
-	'urn:oid:2.5.4.50' => 'uniqueMember',
-	'urn:oid:2.5.4.51' => 'houseIdentifier',
-	'urn:oid:2.5.4.52' => 'supportedAlgorithms',
-	'urn:oid:2.5.4.53' => 'deltaRevocationList',
-	'urn:oid:2.5.4.54' => 'dmdName',
-	'urn:oid:2.5.4.6' => 'c',
-	'urn:oid:2.5.4.65' => 'pseudonym',
-	'urn:oid:2.5.4.7' => 'l',
-	'urn:oid:2.5.4.8' => 'st',
-	'urn:oid:2.5.4.9' => 'street',
+    'urn:oid:0.9.2342.19200300.100.1.1'  => 'uid',
+    'urn:oid:0.9.2342.19200300.100.1.10' => 'manager',
+    'urn:oid:0.9.2342.19200300.100.1.11' => 'documentIdentifier',
+    'urn:oid:0.9.2342.19200300.100.1.12' => 'documentTitle',
+    'urn:oid:0.9.2342.19200300.100.1.13' => 'documentVersion',
+    'urn:oid:0.9.2342.19200300.100.1.14' => 'documentAuthor',
+    'urn:oid:0.9.2342.19200300.100.1.15' => 'documentLocation',
+    'urn:oid:0.9.2342.19200300.100.1.2'  => 'textEncodedORAddress',
+    'urn:oid:0.9.2342.19200300.100.1.20' => 'homePhone',
+    'urn:oid:0.9.2342.19200300.100.1.21' => 'secretary',
+    'urn:oid:0.9.2342.19200300.100.1.22' => 'otherMailbox',
+    'urn:oid:0.9.2342.19200300.100.1.25' => 'dc',
+    'urn:oid:0.9.2342.19200300.100.1.26' => 'aRecord',
+    'urn:oid:0.9.2342.19200300.100.1.27' => 'mDRecord',
+    'urn:oid:0.9.2342.19200300.100.1.28' => 'mXRecord',
+    'urn:oid:0.9.2342.19200300.100.1.29' => 'nSRecord',
+    'urn:oid:0.9.2342.19200300.100.1.3'  => 'mail',
+    'urn:oid:0.9.2342.19200300.100.1.30' => 'sOARecord',
+    'urn:oid:0.9.2342.19200300.100.1.31' => 'cNAMERecord',
+    'urn:oid:0.9.2342.19200300.100.1.37' => 'associatedDomain',
+    'urn:oid:0.9.2342.19200300.100.1.38' => 'associatedName',
+    'urn:oid:0.9.2342.19200300.100.1.39' => 'homePostalAddress',
+    'urn:oid:0.9.2342.19200300.100.1.4'  => 'info',
+    'urn:oid:0.9.2342.19200300.100.1.40' => 'personalTitle',
+    'urn:oid:0.9.2342.19200300.100.1.41' => 'mobile',
+    'urn:oid:0.9.2342.19200300.100.1.42' => 'pager',
+    'urn:oid:0.9.2342.19200300.100.1.43' => 'co',
+    'urn:oid:0.9.2342.19200300.100.1.44' => 'uniqueIdentifier',
+    'urn:oid:0.9.2342.19200300.100.1.45' => 'organizationalStatus',
+    'urn:oid:0.9.2342.19200300.100.1.46' => 'janetMailbox',
+    'urn:oid:0.9.2342.19200300.100.1.47' => 'mailPreferenceOption',
+    'urn:oid:0.9.2342.19200300.100.1.48' => 'buildingName',
+    'urn:oid:0.9.2342.19200300.100.1.49' => 'dSAQuality',
+    'urn:oid:0.9.2342.19200300.100.1.5'  => 'drink',
+    'urn:oid:0.9.2342.19200300.100.1.50' => 'singleLevelQuality',
+    'urn:oid:0.9.2342.19200300.100.1.51' => 'subtreeMinimumQuality',
+    'urn:oid:0.9.2342.19200300.100.1.52' => 'subtreeMaximumQuality',
+    'urn:oid:0.9.2342.19200300.100.1.53' => 'personalSignature',
+    'urn:oid:0.9.2342.19200300.100.1.54' => 'dITRedirect',
+    'urn:oid:0.9.2342.19200300.100.1.55' => 'audio',
+    'urn:oid:0.9.2342.19200300.100.1.56' => 'documentPublisher',
+    'urn:oid:0.9.2342.19200300.100.1.6'  => 'roomNumber',
+    'urn:oid:0.9.2342.19200300.100.1.60' => 'jpegPhoto',
+    'urn:oid:0.9.2342.19200300.100.1.7'  => 'photo',
+    'urn:oid:0.9.2342.19200300.100.1.8'  => 'userClass',
+    'urn:oid:0.9.2342.19200300.100.1.9'  => 'host',
+    'urn:oid:1.2.840.113549.1.9.1'       => 'email',
+    'urn:oid:1.2.752.194.10.2.2'         => 'sisSchoolGrade',
+    'urn:oid:1.2.752.194.10.2.1'         => 'sisLegalGuardianFor',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.1'    => 'norEduOrgUniqueNumber',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.11'   => 'norEduOrgSchemaVersion',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.12'   => 'norEduOrgNIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.2'    => 'norEduOrgUnitUniqueNumber',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.3'    => 'norEduPersonBirthDate',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.4'    => 'norEduPersonLIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.5'    => 'norEduPersonNIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.6'    => 'norEduOrgAcronym',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.7'    => 'norEduOrgUniqueIdentifier',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.8'    => 'norEduOrgUnitUniqueIdentifier',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.9'    => 'federationFeideSchemaVersion',
+    'urn:oid:1.3.6.1.4.1.250.1.57'       => 'labeledURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.1'   => 'eduPersonAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.11'  => 'eduPersonAssurance',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.10'  => 'eduPersonTargetedID',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.2'   => 'eduPersonNickname',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.3'   => 'eduPersonOrgDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.4'   => 'eduPersonOrgUnitDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.5'   => 'eduPersonPrimaryAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.6'   => 'eduPersonPrincipalName',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.7'   => 'eduPersonEntitlement',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.8'   => 'eduPersonPrimaryOrgUnitDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.9'   => 'eduPersonScopedAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.2'   => 'eduOrgHomePageURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.3'   => 'eduOrgIdentityAuthNPolicyURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.4'   => 'eduOrgLegalName',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.5'   => 'eduOrgSuperiorURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.6'   => 'eduOrgWhitePagesURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.5.1.1'   => 'isMemberOf',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.1'    => 'schacMotherTongue',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.2'    => 'schacGender',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.3'    => 'schacDateOfBirth',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.4'    => 'schacPlaceOfBirth',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.5'    => 'schacCountryOfCitizenship',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.6'    => 'schacSn1',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.7'    => 'schacSn2',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.8'    => 'schacPersonalTitle',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.9'    => 'schacHomeOrganization',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.10'   => 'schacHomeOrganizationType',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.11'   => 'schacCountryOfResidence',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.12'   => 'schacUserPresenceID',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.13'   => 'schacPersonalPosition',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.14'   => 'schacPersonalUniqueCode',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.15'   => 'schacPersonalUniqueID',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.17'   => 'schacExpiryDate',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.18'   => 'schacUserPrivateAttribute',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.19'   => 'schacUserStatus',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.20'   => 'schacProjectMembership',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.21'   => 'schacProjectSpecificRole',
+    'urn:oid:2.16.840.1.113730.3.1.1'    => 'carLicense',
+    'urn:oid:2.16.840.1.113730.3.1.2'    => 'departmentNumber',
+    'urn:oid:2.16.840.1.113730.3.1.216'  => 'userPKCS12',
+    'urn:oid:2.16.840.1.113730.3.1.241'  => 'displayName',
+    'urn:oid:2.16.840.1.113730.3.1.3'    => 'employeeNumber',
+    'urn:oid:2.16.840.1.113730.3.1.39'   => 'preferredLanguage',
+    'urn:oid:2.16.840.1.113730.3.1.4'    => 'employeeType',
+    'urn:oid:2.16.840.1.113730.3.1.40'   => 'userSMIMECertificate',
+    'urn:oid:2.5.4.0'                    => 'objectClass',
+    'urn:oid:2.5.4.1'                    => 'aliasedObjectName',
+    'urn:oid:2.5.4.10'                   => 'o',
+    'urn:oid:2.5.4.11'                   => 'ou',
+    'urn:oid:2.5.4.12'                   => 'title',
+    'urn:oid:2.5.4.13'                   => 'description',
+    'urn:oid:2.5.4.14'                   => 'searchGuide',
+    'urn:oid:2.5.4.15'                   => 'businessCategory',
+    'urn:oid:2.5.4.16'                   => 'postalAddress',
+    'urn:oid:2.5.4.17'                   => 'postalCode',
+    'urn:oid:2.5.4.18'                   => 'postOfficeBox',
+    'urn:oid:2.5.4.19'                   => 'physicalDeliveryOfficeName',
+    'urn:oid:2.5.4.2'                    => 'knowledgeInformation',
+    'urn:oid:2.5.4.20'                   => 'telephoneNumber',
+    'urn:oid:2.5.4.21'                   => 'telexNumber',
+    'urn:oid:2.5.4.22'                   => 'teletexTerminalIdentifier',
+    'urn:oid:2.5.4.23'                   => 'facsimileTelephoneNumber',
+    'urn:oid:2.5.4.24'                   => 'x121Address',
+    'urn:oid:2.5.4.25'                   => 'internationaliSDNNumber',
+    'urn:oid:2.5.4.26'                   => 'registeredAddress',
+    'urn:oid:2.5.4.27'                   => 'destinationIndicator',
+    'urn:oid:2.5.4.28'                   => 'preferredDeliveryMethod',
+    'urn:oid:2.5.4.29'                   => 'presentationAddress',
+    'urn:oid:2.5.4.3'                    => 'cn',
+    'urn:oid:2.5.4.30'                   => 'supportedApplicationContext',
+    'urn:oid:2.5.4.31'                   => 'member',
+    'urn:oid:2.5.4.32'                   => 'owner',
+    'urn:oid:2.5.4.33'                   => 'roleOccupant',
+    'urn:oid:2.5.4.34'                   => 'seeAlso',
+    'urn:oid:2.5.4.35'                   => 'userPassword',
+    'urn:oid:2.5.4.36'                   => 'userCertificate',
+    'urn:oid:2.5.4.37'                   => 'cACertificate',
+    'urn:oid:2.5.4.38'                   => 'authorityRevocationList',
+    'urn:oid:2.5.4.39'                   => 'certificateRevocationList',
+    'urn:oid:2.5.4.4'                    => 'sn',
+    'urn:oid:2.5.4.40'                   => 'crossCertificatePair',
+    'urn:oid:2.5.4.41'                   => 'name',
+    'urn:oid:2.5.4.42'                   => 'givenName',
+    'urn:oid:2.5.4.43'                   => 'initials',
+    'urn:oid:2.5.4.44'                   => 'generationQualifier',
+    'urn:oid:2.5.4.45'                   => 'x500UniqueIdentifier',
+    'urn:oid:2.5.4.46'                   => 'dnQualifier',
+    'urn:oid:2.5.4.47'                   => 'enhancedSearchGuide',
+    'urn:oid:2.5.4.48'                   => 'protocolInformation',
+    'urn:oid:2.5.4.49'                   => 'distinguishedName',
+    'urn:oid:2.5.4.5'                    => 'serialNumber',
+    'urn:oid:2.5.4.50'                   => 'uniqueMember',
+    'urn:oid:2.5.4.51'                   => 'houseIdentifier',
+    'urn:oid:2.5.4.52'                   => 'supportedAlgorithms',
+    'urn:oid:2.5.4.53'                   => 'deltaRevocationList',
+    'urn:oid:2.5.4.54'                   => 'dmdName',
+    'urn:oid:2.5.4.6'                    => 'c',
+    'urn:oid:2.5.4.65'                   => 'pseudonym',
+    'urn:oid:2.5.4.7'                    => 'l',
+    'urn:oid:2.5.4.8'                    => 'st',
+    'urn:oid:2.5.4.9'                    => 'street',
 );
diff --git a/attributemap/oid2urn.php b/attributemap/oid2urn.php
index 3ddfc472c..1850f8515 100644
--- a/attributemap/oid2urn.php
+++ b/attributemap/oid2urn.php
@@ -1,164 +1,164 @@
 <?php
 $attributemap = array(
-	'urn:oid:0.9.2342.19200300.100.1.1' => 'urn:mace:dir:attribute-def:uid',
-	'urn:oid:0.9.2342.19200300.100.1.10' => 'urn:mace:dir:attribute-def:manager',
-	'urn:oid:0.9.2342.19200300.100.1.11' => 'urn:mace:dir:attribute-def:documentIdentifier',
-	'urn:oid:0.9.2342.19200300.100.1.12' => 'urn:mace:dir:attribute-def:documentTitle',
-	'urn:oid:0.9.2342.19200300.100.1.13' => 'urn:mace:dir:attribute-def:documentVersion',
-	'urn:oid:0.9.2342.19200300.100.1.14' => 'urn:mace:dir:attribute-def:documentAuthor',
-	'urn:oid:0.9.2342.19200300.100.1.15' => 'urn:mace:dir:attribute-def:documentLocation',
-	'urn:oid:0.9.2342.19200300.100.1.2' => 'urn:mace:dir:attribute-def:textEncodedORAddress',
-	'urn:oid:0.9.2342.19200300.100.1.20' => 'urn:mace:dir:attribute-def:homePhone',
-	'urn:oid:0.9.2342.19200300.100.1.21' => 'urn:mace:dir:attribute-def:secretary',
-	'urn:oid:0.9.2342.19200300.100.1.22' => 'urn:mace:dir:attribute-def:otherMailbox',
-	'urn:oid:0.9.2342.19200300.100.1.25' => 'urn:mace:dir:attribute-def:dc',
-	'urn:oid:0.9.2342.19200300.100.1.26' => 'urn:mace:dir:attribute-def:aRecord',
-	'urn:oid:0.9.2342.19200300.100.1.27' => 'urn:mace:dir:attribute-def:mDRecord',
-	'urn:oid:0.9.2342.19200300.100.1.28' => 'urn:mace:dir:attribute-def:mXRecord',
-	'urn:oid:0.9.2342.19200300.100.1.29' => 'urn:mace:dir:attribute-def:nSRecord',
-	'urn:oid:0.9.2342.19200300.100.1.3' => 'urn:mace:dir:attribute-def:mail',
-	'urn:oid:0.9.2342.19200300.100.1.30' => 'urn:mace:dir:attribute-def:sOARecord',
-	'urn:oid:0.9.2342.19200300.100.1.31' => 'urn:mace:dir:attribute-def:cNAMERecord',
-	'urn:oid:0.9.2342.19200300.100.1.37' => 'urn:mace:dir:attribute-def:associatedDomain',
-	'urn:oid:0.9.2342.19200300.100.1.38' => 'urn:mace:dir:attribute-def:associatedName',
-	'urn:oid:0.9.2342.19200300.100.1.39' => 'urn:mace:dir:attribute-def:homePostalAddress',
-	'urn:oid:0.9.2342.19200300.100.1.4' => 'urn:mace:dir:attribute-def:info',
-	'urn:oid:0.9.2342.19200300.100.1.40' => 'urn:mace:dir:attribute-def:personalTitle',
-	'urn:oid:0.9.2342.19200300.100.1.41' => 'urn:mace:dir:attribute-def:mobile',
-	'urn:oid:0.9.2342.19200300.100.1.42' => 'urn:mace:dir:attribute-def:pager',
-	'urn:oid:0.9.2342.19200300.100.1.43' => 'urn:mace:dir:attribute-def:co',
-	'urn:oid:0.9.2342.19200300.100.1.44' => 'urn:mace:dir:attribute-def:uniqueIdentifier',
-	'urn:oid:0.9.2342.19200300.100.1.45' => 'urn:mace:dir:attribute-def:organizationalStatus',
-	'urn:oid:0.9.2342.19200300.100.1.46' => 'urn:mace:dir:attribute-def:janetMailbox',
-	'urn:oid:0.9.2342.19200300.100.1.47' => 'urn:mace:dir:attribute-def:mailPreferenceOption',
-	'urn:oid:0.9.2342.19200300.100.1.48' => 'urn:mace:dir:attribute-def:buildingName',
-	'urn:oid:0.9.2342.19200300.100.1.49' => 'urn:mace:dir:attribute-def:dSAQuality',
-	'urn:oid:0.9.2342.19200300.100.1.5' => 'urn:mace:dir:attribute-def:drink',
-	'urn:oid:0.9.2342.19200300.100.1.50' => 'urn:mace:dir:attribute-def:singleLevelQuality',
-	'urn:oid:0.9.2342.19200300.100.1.51' => 'urn:mace:dir:attribute-def:subtreeMinimumQuality',
-	'urn:oid:0.9.2342.19200300.100.1.52' => 'urn:mace:dir:attribute-def:subtreeMaximumQuality',
-	'urn:oid:0.9.2342.19200300.100.1.53' => 'urn:mace:dir:attribute-def:personalSignature',
-	'urn:oid:0.9.2342.19200300.100.1.54' => 'urn:mace:dir:attribute-def:dITRedirect',
-	'urn:oid:0.9.2342.19200300.100.1.55' => 'urn:mace:dir:attribute-def:audio',
-	'urn:oid:0.9.2342.19200300.100.1.56' => 'urn:mace:dir:attribute-def:documentPublisher',
-	'urn:oid:0.9.2342.19200300.100.1.6' => 'urn:mace:dir:attribute-def:roomNumber',
-	'urn:oid:0.9.2342.19200300.100.1.60' => 'urn:mace:dir:attribute-def:jpegPhoto',
-	'urn:oid:0.9.2342.19200300.100.1.7' => 'urn:mace:dir:attribute-def:photo',
-	'urn:oid:0.9.2342.19200300.100.1.8' => 'urn:mace:dir:attribute-def:userClass',
-	'urn:oid:0.9.2342.19200300.100.1.9' => 'urn:mace:dir:attribute-def:host',
-	'urn:oid:1.2.840.113549.1.9.1' => 'urn:mace:dir:attribute-def:email',
-	'urn:oid:1.2.752.194.10.2.2' => 'urn:mace:dir:attribute-def:sisSchoolGrade',
-	'urn:oid:1.2.752.194.10.2.1' => 'urn:mace:dir:attribute-def:sisLegalGuardianFor',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.1' => 'urn:mace:dir:attribute-def:norEduOrgUniqueNumber',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.11' => 'urn:mace:dir:attribute-def:norEduOrgSchemaVersion',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.12' => 'urn:mace:dir:attribute-def:norEduOrgNIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.2' => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.3' => 'urn:mace:dir:attribute-def:norEduPersonBirthDate',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.4' => 'urn:mace:dir:attribute-def:norEduPersonLIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.5' => 'urn:mace:dir:attribute-def:norEduPersonNIN',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.6' => 'urn:mace:dir:attribute-def:norEduOrgAcronym',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.7' => 'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.8' => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier',
-	'urn:oid:1.3.6.1.4.1.2428.90.1.9' => 'urn:mace:dir:attribute-def:federationFeideSchemaVersion',
-	'urn:oid:1.3.6.1.4.1.250.1.57' => 'urn:mace:dir:attribute-def:labeledURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.1' => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.11' => 'urn:mace:dir:attribute-def:eduPersonAssurance',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.10' => 'urn:mace:dir:attribute-def:eduPersonTargetedID',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.2' => 'urn:mace:dir:attribute-def:eduPersonNickname',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.3' => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.4' => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.5' => 'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.6' => 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.7' => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.8' => 'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN',
-	'urn:oid:1.3.6.1.4.1.5923.1.1.1.9' => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.2' => 'urn:mace:dir:attribute-def:eduOrgHomePageURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.3' => 'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.4' => 'urn:mace:dir:attribute-def:eduOrgLegalName',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.5' => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
-	'urn:oid:1.3.6.1.4.1.5923.1.2.1.6' => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.1' => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.2' => 'urn:mace:terena.org:attribute-def:schacGender',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.3' => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.4' => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.5' => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.6' => 'urn:mace:terena.org:attribute-def:schacSn1',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.7' => 'urn:mace:terena.org:attribute-def:schacSn2',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.8' => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.9' => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.10' => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.11' => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.12' => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.13' => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.14' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.15' => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.17' => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.18' => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.19' => 'urn:mace:terena.org:attribute-def:schacUserStatus',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.20' => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
-	'urn:oid:1.3.6.1.4.1.25178.1.2.21' => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
-	'urn:oid:2.16.840.1.113730.3.1.1' => 'urn:mace:dir:attribute-def:carLicense',
-	'urn:oid:2.16.840.1.113730.3.1.2' => 'urn:mace:dir:attribute-def:departmentNumber',
-	'urn:oid:2.16.840.1.113730.3.1.216' => 'urn:mace:dir:attribute-def:userPKCS12',
-	'urn:oid:2.16.840.1.113730.3.1.241' => 'urn:mace:dir:attribute-def:displayName',
-	'urn:oid:2.16.840.1.113730.3.1.3' => 'urn:mace:dir:attribute-def:employeeNumber',
-	'urn:oid:2.16.840.1.113730.3.1.39' => 'urn:mace:dir:attribute-def:preferredLanguage',
-	'urn:oid:2.16.840.1.113730.3.1.4' => 'urn:mace:dir:attribute-def:employeeType',
-	'urn:oid:2.16.840.1.113730.3.1.40' => 'urn:mace:dir:attribute-def:userSMIMECertificate',
-	'urn:oid:2.5.4.0' => 'urn:mace:dir:attribute-def:objectClass',
-	'urn:oid:2.5.4.1' => 'urn:mace:dir:attribute-def:aliasedObjectName',
-	'urn:oid:2.5.4.10' => 'urn:mace:dir:attribute-def:o',
-	'urn:oid:2.5.4.11' => 'urn:mace:dir:attribute-def:ou',
-	'urn:oid:2.5.4.12' => 'urn:mace:dir:attribute-def:title',
-	'urn:oid:2.5.4.13' => 'urn:mace:dir:attribute-def:description',
-	'urn:oid:2.5.4.14' => 'urn:mace:dir:attribute-def:searchGuide',
-	'urn:oid:2.5.4.15' => 'urn:mace:dir:attribute-def:businessCategory',
-	'urn:oid:2.5.4.16' => 'urn:mace:dir:attribute-def:postalAddress',
-	'urn:oid:2.5.4.17' => 'urn:mace:dir:attribute-def:postalCode',
-	'urn:oid:2.5.4.18' => 'urn:mace:dir:attribute-def:postOfficeBox',
-	'urn:oid:2.5.4.19' => 'urn:mace:dir:attribute-def:physicalDeliveryOfficeName',
-	'urn:oid:2.5.4.2' => 'urn:mace:dir:attribute-def:knowledgeInformation',
-	'urn:oid:2.5.4.20' => 'urn:mace:dir:attribute-def:telephoneNumber',
-	'urn:oid:2.5.4.21' => 'urn:mace:dir:attribute-def:telexNumber',
-	'urn:oid:2.5.4.22' => 'urn:mace:dir:attribute-def:teletexTerminalIdentifier',
-	'urn:oid:2.5.4.23' => 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
-	'urn:oid:2.5.4.24' => 'urn:mace:dir:attribute-def:x121Address',
-	'urn:oid:2.5.4.25' => 'urn:mace:dir:attribute-def:internationaliSDNNumber',
-	'urn:oid:2.5.4.26' => 'urn:mace:dir:attribute-def:registeredAddress',
-	'urn:oid:2.5.4.27' => 'urn:mace:dir:attribute-def:destinationIndicator',
-	'urn:oid:2.5.4.28' => 'urn:mace:dir:attribute-def:preferredDeliveryMethod',
-	'urn:oid:2.5.4.29' => 'urn:mace:dir:attribute-def:presentationAddress',
-	'urn:oid:2.5.4.3' => 'urn:mace:dir:attribute-def:cn',
-	'urn:oid:2.5.4.30' => 'urn:mace:dir:attribute-def:supportedApplicationContext',
-	'urn:oid:2.5.4.31' => 'urn:mace:dir:attribute-def:member',
-	'urn:oid:2.5.4.32' => 'urn:mace:dir:attribute-def:owner',
-	'urn:oid:2.5.4.33' => 'urn:mace:dir:attribute-def:roleOccupant',
-	'urn:oid:2.5.4.34' => 'urn:mace:dir:attribute-def:seeAlso',
-	'urn:oid:2.5.4.35' => 'urn:mace:dir:attribute-def:userPassword',
-	'urn:oid:2.5.4.36' => 'urn:mace:dir:attribute-def:userCertificate',
-	'urn:oid:2.5.4.37' => 'urn:mace:dir:attribute-def:cACertificate',
-	'urn:oid:2.5.4.38' => 'urn:mace:dir:attribute-def:authorityRevocationList',
-	'urn:oid:2.5.4.39' => 'urn:mace:dir:attribute-def:certificateRevocationList',
-	'urn:oid:2.5.4.4' => 'urn:mace:dir:attribute-def:sn',
-	'urn:oid:2.5.4.40' => 'urn:mace:dir:attribute-def:crossCertificatePair',
-	'urn:oid:2.5.4.41' => 'urn:mace:dir:attribute-def:name',
-	'urn:oid:2.5.4.42' => 'urn:mace:dir:attribute-def:givenName',
-	'urn:oid:2.5.4.43' => 'urn:mace:dir:attribute-def:initials',
-	'urn:oid:2.5.4.44' => 'urn:mace:dir:attribute-def:generationQualifier',
-	'urn:oid:2.5.4.45' => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
-	'urn:oid:2.5.4.46' => 'urn:mace:dir:attribute-def:dnQualifier',
-	'urn:oid:2.5.4.47' => 'urn:mace:dir:attribute-def:enhancedSearchGuide',
-	'urn:oid:2.5.4.48' => 'urn:mace:dir:attribute-def:protocolInformation',
-	'urn:oid:2.5.4.49' => 'urn:mace:dir:attribute-def:distinguishedName',
-	'urn:oid:2.5.4.5' => 'urn:mace:dir:attribute-def:serialNumber',
-	'urn:oid:2.5.4.50' => 'urn:mace:dir:attribute-def:uniqueMember',
-	'urn:oid:2.5.4.51' => 'urn:mace:dir:attribute-def:houseIdentifier',
-	'urn:oid:2.5.4.52' => 'urn:mace:dir:attribute-def:supportedAlgorithms',
-	'urn:oid:2.5.4.53' => 'urn:mace:dir:attribute-def:deltaRevocationList',
-	'urn:oid:2.5.4.54' => 'urn:mace:dir:attribute-def:dmdName',
-	'urn:oid:2.5.4.6' => 'urn:mace:dir:attribute-def:c',
-	'urn:oid:2.5.4.65' => 'urn:mace:dir:attribute-def:pseudonym',
-	'urn:oid:2.5.4.7' => 'urn:mace:dir:attribute-def:l',
-	'urn:oid:2.5.4.8' => 'urn:mace:dir:attribute-def:st',
-	'urn:oid:2.5.4.9' => 'urn:mace:dir:attribute-def:street',
+    'urn:oid:0.9.2342.19200300.100.1.1'  => 'urn:mace:dir:attribute-def:uid',
+    'urn:oid:0.9.2342.19200300.100.1.10' => 'urn:mace:dir:attribute-def:manager',
+    'urn:oid:0.9.2342.19200300.100.1.11' => 'urn:mace:dir:attribute-def:documentIdentifier',
+    'urn:oid:0.9.2342.19200300.100.1.12' => 'urn:mace:dir:attribute-def:documentTitle',
+    'urn:oid:0.9.2342.19200300.100.1.13' => 'urn:mace:dir:attribute-def:documentVersion',
+    'urn:oid:0.9.2342.19200300.100.1.14' => 'urn:mace:dir:attribute-def:documentAuthor',
+    'urn:oid:0.9.2342.19200300.100.1.15' => 'urn:mace:dir:attribute-def:documentLocation',
+    'urn:oid:0.9.2342.19200300.100.1.2'  => 'urn:mace:dir:attribute-def:textEncodedORAddress',
+    'urn:oid:0.9.2342.19200300.100.1.20' => 'urn:mace:dir:attribute-def:homePhone',
+    'urn:oid:0.9.2342.19200300.100.1.21' => 'urn:mace:dir:attribute-def:secretary',
+    'urn:oid:0.9.2342.19200300.100.1.22' => 'urn:mace:dir:attribute-def:otherMailbox',
+    'urn:oid:0.9.2342.19200300.100.1.25' => 'urn:mace:dir:attribute-def:dc',
+    'urn:oid:0.9.2342.19200300.100.1.26' => 'urn:mace:dir:attribute-def:aRecord',
+    'urn:oid:0.9.2342.19200300.100.1.27' => 'urn:mace:dir:attribute-def:mDRecord',
+    'urn:oid:0.9.2342.19200300.100.1.28' => 'urn:mace:dir:attribute-def:mXRecord',
+    'urn:oid:0.9.2342.19200300.100.1.29' => 'urn:mace:dir:attribute-def:nSRecord',
+    'urn:oid:0.9.2342.19200300.100.1.3'  => 'urn:mace:dir:attribute-def:mail',
+    'urn:oid:0.9.2342.19200300.100.1.30' => 'urn:mace:dir:attribute-def:sOARecord',
+    'urn:oid:0.9.2342.19200300.100.1.31' => 'urn:mace:dir:attribute-def:cNAMERecord',
+    'urn:oid:0.9.2342.19200300.100.1.37' => 'urn:mace:dir:attribute-def:associatedDomain',
+    'urn:oid:0.9.2342.19200300.100.1.38' => 'urn:mace:dir:attribute-def:associatedName',
+    'urn:oid:0.9.2342.19200300.100.1.39' => 'urn:mace:dir:attribute-def:homePostalAddress',
+    'urn:oid:0.9.2342.19200300.100.1.4'  => 'urn:mace:dir:attribute-def:info',
+    'urn:oid:0.9.2342.19200300.100.1.40' => 'urn:mace:dir:attribute-def:personalTitle',
+    'urn:oid:0.9.2342.19200300.100.1.41' => 'urn:mace:dir:attribute-def:mobile',
+    'urn:oid:0.9.2342.19200300.100.1.42' => 'urn:mace:dir:attribute-def:pager',
+    'urn:oid:0.9.2342.19200300.100.1.43' => 'urn:mace:dir:attribute-def:co',
+    'urn:oid:0.9.2342.19200300.100.1.44' => 'urn:mace:dir:attribute-def:uniqueIdentifier',
+    'urn:oid:0.9.2342.19200300.100.1.45' => 'urn:mace:dir:attribute-def:organizationalStatus',
+    'urn:oid:0.9.2342.19200300.100.1.46' => 'urn:mace:dir:attribute-def:janetMailbox',
+    'urn:oid:0.9.2342.19200300.100.1.47' => 'urn:mace:dir:attribute-def:mailPreferenceOption',
+    'urn:oid:0.9.2342.19200300.100.1.48' => 'urn:mace:dir:attribute-def:buildingName',
+    'urn:oid:0.9.2342.19200300.100.1.49' => 'urn:mace:dir:attribute-def:dSAQuality',
+    'urn:oid:0.9.2342.19200300.100.1.5'  => 'urn:mace:dir:attribute-def:drink',
+    'urn:oid:0.9.2342.19200300.100.1.50' => 'urn:mace:dir:attribute-def:singleLevelQuality',
+    'urn:oid:0.9.2342.19200300.100.1.51' => 'urn:mace:dir:attribute-def:subtreeMinimumQuality',
+    'urn:oid:0.9.2342.19200300.100.1.52' => 'urn:mace:dir:attribute-def:subtreeMaximumQuality',
+    'urn:oid:0.9.2342.19200300.100.1.53' => 'urn:mace:dir:attribute-def:personalSignature',
+    'urn:oid:0.9.2342.19200300.100.1.54' => 'urn:mace:dir:attribute-def:dITRedirect',
+    'urn:oid:0.9.2342.19200300.100.1.55' => 'urn:mace:dir:attribute-def:audio',
+    'urn:oid:0.9.2342.19200300.100.1.56' => 'urn:mace:dir:attribute-def:documentPublisher',
+    'urn:oid:0.9.2342.19200300.100.1.6'  => 'urn:mace:dir:attribute-def:roomNumber',
+    'urn:oid:0.9.2342.19200300.100.1.60' => 'urn:mace:dir:attribute-def:jpegPhoto',
+    'urn:oid:0.9.2342.19200300.100.1.7'  => 'urn:mace:dir:attribute-def:photo',
+    'urn:oid:0.9.2342.19200300.100.1.8'  => 'urn:mace:dir:attribute-def:userClass',
+    'urn:oid:0.9.2342.19200300.100.1.9'  => 'urn:mace:dir:attribute-def:host',
+    'urn:oid:1.2.840.113549.1.9.1'       => 'urn:mace:dir:attribute-def:email',
+    'urn:oid:1.2.752.194.10.2.2'         => 'urn:mace:dir:attribute-def:sisSchoolGrade',
+    'urn:oid:1.2.752.194.10.2.1'         => 'urn:mace:dir:attribute-def:sisLegalGuardianFor',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.1'    => 'urn:mace:dir:attribute-def:norEduOrgUniqueNumber',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.11'   => 'urn:mace:dir:attribute-def:norEduOrgSchemaVersion',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.12'   => 'urn:mace:dir:attribute-def:norEduOrgNIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.2'    => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.3'    => 'urn:mace:dir:attribute-def:norEduPersonBirthDate',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.4'    => 'urn:mace:dir:attribute-def:norEduPersonLIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.5'    => 'urn:mace:dir:attribute-def:norEduPersonNIN',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.6'    => 'urn:mace:dir:attribute-def:norEduOrgAcronym',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.7'    => 'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.8'    => 'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier',
+    'urn:oid:1.3.6.1.4.1.2428.90.1.9'    => 'urn:mace:dir:attribute-def:federationFeideSchemaVersion',
+    'urn:oid:1.3.6.1.4.1.250.1.57'       => 'urn:mace:dir:attribute-def:labeledURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.1'   => 'urn:mace:dir:attribute-def:eduPersonAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.11'  => 'urn:mace:dir:attribute-def:eduPersonAssurance',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.10'  => 'urn:mace:dir:attribute-def:eduPersonTargetedID',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.2'   => 'urn:mace:dir:attribute-def:eduPersonNickname',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.3'   => 'urn:mace:dir:attribute-def:eduPersonOrgDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.4'   => 'urn:mace:dir:attribute-def:eduPersonOrgUnitDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.5'   => 'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.6'   => 'urn:mace:dir:attribute-def:eduPersonPrincipalName',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.7'   => 'urn:mace:dir:attribute-def:eduPersonEntitlement',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.8'   => 'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN',
+    'urn:oid:1.3.6.1.4.1.5923.1.1.1.9'   => 'urn:mace:dir:attribute-def:eduPersonScopedAffiliation',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.2'   => 'urn:mace:dir:attribute-def:eduOrgHomePageURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.3'   => 'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.4'   => 'urn:mace:dir:attribute-def:eduOrgLegalName',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.5'   => 'urn:mace:dir:attribute-def:eduOrgSuperiorURI',
+    'urn:oid:1.3.6.1.4.1.5923.1.2.1.6'   => 'urn:mace:dir:attribute-def:eduOrgWhitePagesURI',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.1'    => 'urn:mace:terena.org:attribute-def:schacMotherTongue',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.2'    => 'urn:mace:terena.org:attribute-def:schacGender',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.3'    => 'urn:mace:terena.org:attribute-def:schacDateOfBirth',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.4'    => 'urn:mace:terena.org:attribute-def:schacPlaceOfBirth',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.5'    => 'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.6'    => 'urn:mace:terena.org:attribute-def:schacSn1',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.7'    => 'urn:mace:terena.org:attribute-def:schacSn2',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.8'    => 'urn:mace:terena.org:attribute-def:schacPersonalTitle',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.9'    => 'urn:mace:terena.org:attribute-def:schacHomeOrganization',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.10'   => 'urn:mace:terena.org:attribute-def:schacHomeOrganizationType',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.11'   => 'urn:mace:terena.org:attribute-def:schacCountryOfResidence',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.12'   => 'urn:mace:terena.org:attribute-def:schacUserPresenceID',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.13'   => 'urn:mace:terena.org:attribute-def:schacPersonalPosition',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.14'   => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.15'   => 'urn:mace:terena.org:attribute-def:schacPersonalUniqueID',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.17'   => 'urn:mace:terena.org:attribute-def:schacExpiryDate',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.18'   => 'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.19'   => 'urn:mace:terena.org:attribute-def:schacUserStatus',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.20'   => 'urn:mace:terena.org:attribute-def:schacProjectMembership',
+    'urn:oid:1.3.6.1.4.1.25178.1.2.21'   => 'urn:mace:terena.org:attribute-def:schacProjectSpecificRole',
+    'urn:oid:2.16.840.1.113730.3.1.1'    => 'urn:mace:dir:attribute-def:carLicense',
+    'urn:oid:2.16.840.1.113730.3.1.2'    => 'urn:mace:dir:attribute-def:departmentNumber',
+    'urn:oid:2.16.840.1.113730.3.1.216'  => 'urn:mace:dir:attribute-def:userPKCS12',
+    'urn:oid:2.16.840.1.113730.3.1.241'  => 'urn:mace:dir:attribute-def:displayName',
+    'urn:oid:2.16.840.1.113730.3.1.3'    => 'urn:mace:dir:attribute-def:employeeNumber',
+    'urn:oid:2.16.840.1.113730.3.1.39'   => 'urn:mace:dir:attribute-def:preferredLanguage',
+    'urn:oid:2.16.840.1.113730.3.1.4'    => 'urn:mace:dir:attribute-def:employeeType',
+    'urn:oid:2.16.840.1.113730.3.1.40'   => 'urn:mace:dir:attribute-def:userSMIMECertificate',
+    'urn:oid:2.5.4.0'                    => 'urn:mace:dir:attribute-def:objectClass',
+    'urn:oid:2.5.4.1'                    => 'urn:mace:dir:attribute-def:aliasedObjectName',
+    'urn:oid:2.5.4.10'                   => 'urn:mace:dir:attribute-def:o',
+    'urn:oid:2.5.4.11'                   => 'urn:mace:dir:attribute-def:ou',
+    'urn:oid:2.5.4.12'                   => 'urn:mace:dir:attribute-def:title',
+    'urn:oid:2.5.4.13'                   => 'urn:mace:dir:attribute-def:description',
+    'urn:oid:2.5.4.14'                   => 'urn:mace:dir:attribute-def:searchGuide',
+    'urn:oid:2.5.4.15'                   => 'urn:mace:dir:attribute-def:businessCategory',
+    'urn:oid:2.5.4.16'                   => 'urn:mace:dir:attribute-def:postalAddress',
+    'urn:oid:2.5.4.17'                   => 'urn:mace:dir:attribute-def:postalCode',
+    'urn:oid:2.5.4.18'                   => 'urn:mace:dir:attribute-def:postOfficeBox',
+    'urn:oid:2.5.4.19'                   => 'urn:mace:dir:attribute-def:physicalDeliveryOfficeName',
+    'urn:oid:2.5.4.2'                    => 'urn:mace:dir:attribute-def:knowledgeInformation',
+    'urn:oid:2.5.4.20'                   => 'urn:mace:dir:attribute-def:telephoneNumber',
+    'urn:oid:2.5.4.21'                   => 'urn:mace:dir:attribute-def:telexNumber',
+    'urn:oid:2.5.4.22'                   => 'urn:mace:dir:attribute-def:teletexTerminalIdentifier',
+    'urn:oid:2.5.4.23'                   => 'urn:mace:dir:attribute-def:facsimileTelephoneNumber',
+    'urn:oid:2.5.4.24'                   => 'urn:mace:dir:attribute-def:x121Address',
+    'urn:oid:2.5.4.25'                   => 'urn:mace:dir:attribute-def:internationaliSDNNumber',
+    'urn:oid:2.5.4.26'                   => 'urn:mace:dir:attribute-def:registeredAddress',
+    'urn:oid:2.5.4.27'                   => 'urn:mace:dir:attribute-def:destinationIndicator',
+    'urn:oid:2.5.4.28'                   => 'urn:mace:dir:attribute-def:preferredDeliveryMethod',
+    'urn:oid:2.5.4.29'                   => 'urn:mace:dir:attribute-def:presentationAddress',
+    'urn:oid:2.5.4.3'                    => 'urn:mace:dir:attribute-def:cn',
+    'urn:oid:2.5.4.30'                   => 'urn:mace:dir:attribute-def:supportedApplicationContext',
+    'urn:oid:2.5.4.31'                   => 'urn:mace:dir:attribute-def:member',
+    'urn:oid:2.5.4.32'                   => 'urn:mace:dir:attribute-def:owner',
+    'urn:oid:2.5.4.33'                   => 'urn:mace:dir:attribute-def:roleOccupant',
+    'urn:oid:2.5.4.34'                   => 'urn:mace:dir:attribute-def:seeAlso',
+    'urn:oid:2.5.4.35'                   => 'urn:mace:dir:attribute-def:userPassword',
+    'urn:oid:2.5.4.36'                   => 'urn:mace:dir:attribute-def:userCertificate',
+    'urn:oid:2.5.4.37'                   => 'urn:mace:dir:attribute-def:cACertificate',
+    'urn:oid:2.5.4.38'                   => 'urn:mace:dir:attribute-def:authorityRevocationList',
+    'urn:oid:2.5.4.39'                   => 'urn:mace:dir:attribute-def:certificateRevocationList',
+    'urn:oid:2.5.4.4'                    => 'urn:mace:dir:attribute-def:sn',
+    'urn:oid:2.5.4.40'                   => 'urn:mace:dir:attribute-def:crossCertificatePair',
+    'urn:oid:2.5.4.41'                   => 'urn:mace:dir:attribute-def:name',
+    'urn:oid:2.5.4.42'                   => 'urn:mace:dir:attribute-def:givenName',
+    'urn:oid:2.5.4.43'                   => 'urn:mace:dir:attribute-def:initials',
+    'urn:oid:2.5.4.44'                   => 'urn:mace:dir:attribute-def:generationQualifier',
+    'urn:oid:2.5.4.45'                   => 'urn:mace:dir:attribute-def:x500UniqueIdentifier',
+    'urn:oid:2.5.4.46'                   => 'urn:mace:dir:attribute-def:dnQualifier',
+    'urn:oid:2.5.4.47'                   => 'urn:mace:dir:attribute-def:enhancedSearchGuide',
+    'urn:oid:2.5.4.48'                   => 'urn:mace:dir:attribute-def:protocolInformation',
+    'urn:oid:2.5.4.49'                   => 'urn:mace:dir:attribute-def:distinguishedName',
+    'urn:oid:2.5.4.5'                    => 'urn:mace:dir:attribute-def:serialNumber',
+    'urn:oid:2.5.4.50'                   => 'urn:mace:dir:attribute-def:uniqueMember',
+    'urn:oid:2.5.4.51'                   => 'urn:mace:dir:attribute-def:houseIdentifier',
+    'urn:oid:2.5.4.52'                   => 'urn:mace:dir:attribute-def:supportedAlgorithms',
+    'urn:oid:2.5.4.53'                   => 'urn:mace:dir:attribute-def:deltaRevocationList',
+    'urn:oid:2.5.4.54'                   => 'urn:mace:dir:attribute-def:dmdName',
+    'urn:oid:2.5.4.6'                    => 'urn:mace:dir:attribute-def:c',
+    'urn:oid:2.5.4.65'                   => 'urn:mace:dir:attribute-def:pseudonym',
+    'urn:oid:2.5.4.7'                    => 'urn:mace:dir:attribute-def:l',
+    'urn:oid:2.5.4.8'                    => 'urn:mace:dir:attribute-def:st',
+    'urn:oid:2.5.4.9'                    => 'urn:mace:dir:attribute-def:street',
 );
diff --git a/attributemap/openid2name.php b/attributemap/openid2name.php
index 7a3e68611..624074b02 100644
--- a/attributemap/openid2name.php
+++ b/attributemap/openid2name.php
@@ -1,40 +1,33 @@
 <?php
 $attributemap = array(
+    // Simple Registration + AX Schema
+    'http://axschema.org/namePerson/friendly'     => 'displayName', // Alias/Username -> displayName
+    'openid.sreg.nickname'                        => 'displayName',
+    'http://axschema.org/contact/email'           => 'mail', // Email
+    'openid.sreg.email'                           => 'mail',
+    'http://axschema.org/namePerson'              => 'displayName', // Full name -> displayName
+    'openid.sreg.fullname'                        => 'displayName',
+    'http://axschema.org/contact/postalCode/home' => 'postalCode', // Postal code
+    'openid.sreg.postcode'                        => 'postalCode',
+    'http://axschema.org/contact/country/home'    => 'countryName', // Country
+    'openid.sreg.country'                         => 'countryName',
+    'http://axschema.org/pref/language'           => 'preferredLanguage', // Language
+    'openid.sreg.language'                        => 'preferredLanguage',
+    // Name
+    'http://axschema.org/namePerson/prefix'       => 'personalTitle', // Name prefix
+    'http://axschema.org/namePerson/first'        => 'givenName', // First name
+    'http://axschema.org/namePerson/last'         => 'sn', // Last name
 
-	// The following attributes can used to manufacture usernames
-//	'openid'		=> '', // OpenID Claimed_ID/Identity_URL of the user
-//	'openid.local_id'	=> '', // Identity URL returned by OpenID Server
-//	'openid.server_url'	=> '', //
+    // Work
+    'http://axschema.org/company/name'            => 'o', // Company name
+    'http://axschema.org/company/title'           => 'title', // Job title
 
-	// Simple Registration + AX Schema
-	'http://axschema.org/namePerson/friendly'	=> 'displayName', // Alias/Username -> displayName
-	'openid.sreg.nickname'				=> 'displayName',
-	'http://axschema.org/contact/email'		=> 'mail', // Email
-	'openid.sreg.email'				=> 'mail',
-	'http://axschema.org/namePerson'		=> 'displayName', // Full name -> displayName
-	'openid.sreg.fullname'				=> 'displayName',
-	'http://axschema.org/contact/postalCode/home'	=> 'postalCode', // Postal code
-	'openid.sreg.postcode'				=> 'postalCode',
-	'http://axschema.org/contact/country/home'	=> 'countryName', // Country
-	'openid.sreg.country'				=> 'countryName',
-	'http://axschema.org/pref/language'		=> 'preferredLanguage', // Language
-	'openid.sreg.language'				=> 'preferredLanguage',
+    // Telephone
+    'http://axschema.org/contact/phone/default'   => 'telephoneNumber', // Phone (preferred)
+    'http://axschema.org/contact/phone/home'      => 'homePhone', // Phone (home)
+    'http://axschema.org/contact/phone/business'  => 'telephoneNumber', // Phone (work)
+    'http://axschema.org/contact/phone/cell'      => 'mobile', // Phone (mobile)
+    'http://axschema.org/contact/phone/fax'       => 'facsimileTelephoneNumber', // Phone (fax)
 
-	// Name
-	'http://axschema.org/namePerson/prefix'		=> 'personalTitle', // Name prefix
-	'http://axschema.org/namePerson/first'		=> 'givenName', // First name
-	'http://axschema.org/namePerson/last'		=> 'sn', // Last name
-
-	// Work
-	'http://axschema.org/company/name'		=> 'o', // Company name
-	'http://axschema.org/company/title'		=> 'title', // Job title
-
-	// Telephone
-	'http://axschema.org/contact/phone/default'	=> 'telephoneNumber', // Phone (preferred)
-	'http://axschema.org/contact/phone/home'	=> 'homePhone', // Phone (home)
-	'http://axschema.org/contact/phone/business'	=> 'telephoneNumber', // Phone (work)
-	'http://axschema.org/contact/phone/cell'	=> 'mobile', // Phone (mobile)
-	'http://axschema.org/contact/phone/fax'		=> 'facsimileTelephoneNumber', // Phone (fax)
-
-	// Further attributes can be found at http://www.axschema.org/types/
+    // Further attributes can be found at http://www.axschema.org/types/
 );
diff --git a/attributemap/removeurnprefix.php b/attributemap/removeurnprefix.php
index db9f034ff..6a7c920d5 100644
--- a/attributemap/removeurnprefix.php
+++ b/attributemap/removeurnprefix.php
@@ -1,20 +1,20 @@
 <?php
 
 $attributemap = array(
-	'urn:mace:dir:attribute-def:sn' => 'sn',
-	'urn:mace:dir:attribute-def:telephoneNumber' => 'telephoneNumber',
-	'urn:mace:dir:attribute-def:facsimileTelephoneNumber' => 'facsimileTelephoneNumber',
-	'urn:mace:dir:attribute-def:postalAddress' => 'postalAddress',
-	'urn:mace:dir:attribute-def:givenName' => 'givenName',
-	'urn:mace:dir:attribute-def:homePhone' => 'homePhone',
-	'urn:mace:dir:attribute-def:homePostalAddress' => 'homePostalAddress',
-	'urn:mace:dir:attribute-def:mail' => 'mail',
-	'urn:mace:dir:attribute-def:mobile' => 'mobile',
-	'urn:mace:dir:attribute-def:preferredLanguage' => 'preferredLanguage',
-	'urn:mace:dir:attribute-def:eduPersonPrincipalName' => 'eduPersonPrincipalName',
-	'urn:mace:dir:attribute-def:eduPersonAffiliation' => 'eduPersonAffiliation',
-	'urn:mace:dir:attribute-def:eduPersonScopedAffiliation' => 'eduPersonScopedAffiliation',
-	'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'eduPersonEntitlement',
-	'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
-	'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
+    'urn:mace:dir:attribute-def:sn'                         => 'sn',
+    'urn:mace:dir:attribute-def:telephoneNumber'            => 'telephoneNumber',
+    'urn:mace:dir:attribute-def:facsimileTelephoneNumber'   => 'facsimileTelephoneNumber',
+    'urn:mace:dir:attribute-def:postalAddress'              => 'postalAddress',
+    'urn:mace:dir:attribute-def:givenName'                  => 'givenName',
+    'urn:mace:dir:attribute-def:homePhone'                  => 'homePhone',
+    'urn:mace:dir:attribute-def:homePostalAddress'          => 'homePostalAddress',
+    'urn:mace:dir:attribute-def:mail'                       => 'mail',
+    'urn:mace:dir:attribute-def:mobile'                     => 'mobile',
+    'urn:mace:dir:attribute-def:preferredLanguage'          => 'preferredLanguage',
+    'urn:mace:dir:attribute-def:eduPersonPrincipalName'     => 'eduPersonPrincipalName',
+    'urn:mace:dir:attribute-def:eduPersonAffiliation'       => 'eduPersonAffiliation',
+    'urn:mace:dir:attribute-def:eduPersonScopedAffiliation' => 'eduPersonScopedAffiliation',
+    'urn:mace:dir:attribute-def:eduPersonEntitlement'       => 'eduPersonEntitlement',
+    'urn:mace:dir:attribute-def:eduPersonOrgDN'             => 'eduPersonOrgDN',
+    'urn:mace:dir:attribute-def:eduPersonOrgUnitDN'         => 'eduPersonOrgUnitDN',
 );
diff --git a/attributemap/test.php b/attributemap/test.php
index 65be84dcf..a89ad869f 100644
--- a/attributemap/test.php
+++ b/attributemap/test.php
@@ -1,38 +1,5 @@
 <?php
 
 $attributemap = array(
-	'mobile'			=>	'urn:mace:dir:attribute-def:mobile'
+    'mobile' => 'urn:mace:dir:attribute-def:mobile'
 );
-
-/*
-
-ShibMapAttribute urn:mace:dir:attribute-def:sn Shib-LDAP-Surname surname
-ShibMapAttribute urn:mace:dir:attribute-def:telephoneNumber Shib-LDAP-telephoneNumber telephoneNumber
-ShibMapAttribute urn:mace:dir:attribute-def:facsimileTelephoneNumber Shib-LDAP-facsimileTelephoneNumber facsimileTelephoneNumber
-ShibMapAttribute urn:mace:dir:attribute-def:postalAddress Shib-LDAP-postalAddress postalAddress
-ShibMapAttribute urn:mace:dir:attribute-def:givenName Shib-LDAP-givenName givenName
-ShibMapAttribute urn:mace:dir:attribute-def:homePhone Shib-LDAP-homePhone homePhone
-ShibMapAttribute urn:mace:dir:attribute-def:homePostalAddress Shib-LDAP-homePostalAddress homePostalAddress
-ShibMapAttribute urn:mace:dir:attribute-def:mail Shib-LDAP-mail mail
-ShibMapAttribute urn:mace:dir:attribute-def:mobile Shib-LDAP-mobile mobile
-ShibMapAttribute urn:mace:dir:attribute-def:preferredLanguage Shib-LDAP-preferredLanguage preferredLanguage
-#
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonPrincipalName Shib-EP-PrincipalName eppn
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonAffiliation Shib-EP-Affiliation affiliation
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonScopedAffiliation Shib-EP-ScopedAffiliation scopedAffiliation
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonEntitlement Shib-EP-Entitlement entitlement
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonOrgDN Shib-EP-OrgDN orgDN
-ShibMapAttribute urn:mace:dir:attribute-def:eduPersonOrgUnitDN Shib-EP-OrgUnitDN orgUnitDN
-#
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonUniqueID Shib-SwissEP-UniqueID uniqueID
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonDateOfBirth Shib-SwissEP-DateOfBirth dateOfBirth
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonGender Shib-SwissEP-Gender gender
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonHomeOrganization Shib-SwissEP-HomeOrganization homeOrganization
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonHomeOrganizationType Shib-SwissEP-HomeOrganizationType homeOrganizationType
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch1 Shib-SwissEP-StudyBranch1 studyBranch1
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch2 Shib-SwissEP-StudyBranch2 studyBranch2
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyBranch3 Shib-SwissEP-StudyBranch3 studyBranch3
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStudyLevel Shib-SwissEP-StudyLevel studyLevel
-ShibMapAttribute urn:mace:switch.ch:attribute-def:swissEduPersonStaffCategory Shib-SwissEP-StaffCategory staffCategory
-
-*/
diff --git a/attributemap/urn2name.php b/attributemap/urn2name.php
index 89dee4dec..d69443994 100644
--- a/attributemap/urn2name.php
+++ b/attributemap/urn2name.php
@@ -1,186 +1,186 @@
 <?php
 $attributemap = array(
-	'urn:mace:dir:attribute-def:aRecord' => 'aRecord',
-	'urn:mace:dir:attribute-def:aliasedEntryName' => 'aliasedEntryName',
-	'urn:mace:dir:attribute-def:aliasedObjectName' => 'aliasedObjectName',
-	'urn:mace:dir:attribute-def:associatedDomain' => 'associatedDomain',
-	'urn:mace:dir:attribute-def:associatedName' => 'associatedName',
-	'urn:mace:dir:attribute-def:audio' => 'audio',
-	'urn:mace:dir:attribute-def:authorityRevocationList' => 'authorityRevocationList',
-	'urn:mace:dir:attribute-def:buildingName' => 'buildingName',
-	'urn:mace:dir:attribute-def:businessCategory' => 'businessCategory',
-	'urn:mace:dir:attribute-def:c' => 'c',
-	'urn:mace:dir:attribute-def:cACertificate' => 'cACertificate',
-	'urn:mace:dir:attribute-def:cNAMERecord' => 'cNAMERecord',
-	'urn:mace:dir:attribute-def:carLicense' => 'carLicense',
-	'urn:mace:dir:attribute-def:certificateRevocationList' => 'certificateRevocationList',
-	'urn:mace:dir:attribute-def:cn' => 'cn',
-	'urn:mace:dir:attribute-def:co' => 'co',
-	'urn:mace:dir:attribute-def:commonName' => 'commonName',
-	'urn:mace:dir:attribute-def:countryName' => 'countryName',
-	'urn:mace:dir:attribute-def:crossCertificatePair' => 'crossCertificatePair',
-	'urn:mace:dir:attribute-def:dITRedirect' => 'dITRedirect',
-	'urn:mace:dir:attribute-def:dSAQuality' => 'dSAQuality',
-	'urn:mace:dir:attribute-def:dc' => 'dc',
-	'urn:mace:dir:attribute-def:deltaRevocationList' => 'deltaRevocationList',
-	'urn:mace:dir:attribute-def:departmentNumber' => 'departmentNumber',
-	'urn:mace:dir:attribute-def:description' => 'description',
-	'urn:mace:dir:attribute-def:destinationIndicator' => 'destinationIndicator',
-	'urn:mace:dir:attribute-def:displayName' => 'displayName',
-	'urn:mace:dir:attribute-def:distinguishedName' => 'distinguishedName',
-	'urn:mace:dir:attribute-def:dmdName' => 'dmdName',
-	'urn:mace:dir:attribute-def:dnQualifier' => 'dnQualifier',
-	'urn:mace:dir:attribute-def:documentAuthor' => 'documentAuthor',
-	'urn:mace:dir:attribute-def:documentIdentifier' => 'documentIdentifier',
-	'urn:mace:dir:attribute-def:documentLocation' => 'documentLocation',
-	'urn:mace:dir:attribute-def:documentPublisher' => 'documentPublisher',
-	'urn:mace:dir:attribute-def:documentTitle' => 'documentTitle',
-	'urn:mace:dir:attribute-def:documentVersion' => 'documentVersion',
-	'urn:mace:dir:attribute-def:domainComponent' => 'domainComponent',
-	'urn:mace:dir:attribute-def:drink' => 'drink',
-	'urn:mace:dir:attribute-def:eduOrgHomePageURI' => 'eduOrgHomePageURI',
-	'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI' => 'eduOrgIdentityAuthNPolicyURI',
-	'urn:mace:dir:attribute-def:eduOrgLegalName' => 'eduOrgLegalName',
-	'urn:mace:dir:attribute-def:eduOrgSuperiorURI' => 'eduOrgSuperiorURI',
-	'urn:mace:dir:attribute-def:eduOrgWhitePagesURI' => 'eduOrgWhitePagesURI',
-	'urn:mace:dir:attribute-def:eduPersonAffiliation' => 'eduPersonAffiliation',
-	'urn:mace:dir:attribute-def:eduPersonAssurance' => 'eduPersonAssurance',
-	'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'eduPersonEntitlement',
-	'urn:mace:dir:attribute-def:eduPersonNickname' => 'eduPersonNickname',
-	'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'eduPersonOrgDN',
-	'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'eduPersonOrgUnitDN',
-	'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation' => 'eduPersonPrimaryAffiliation',
-	'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN' => 'eduPersonPrimaryOrgUnitDN',
-	'urn:mace:dir:attribute-def:eduPersonPrincipalName' => 'eduPersonPrincipalName',
-	'urn:mace:dir:attribute-def:eduPersonScopedAffiliation' => 'eduPersonScopedAffiliation',
-	'urn:mace:dir:attribute-def:eduPersonTargetedID' => 'eduPersonTargetedID',
-	'urn:mace:dir:attribute-def:email' => 'email',
-	'urn:mace:dir:attribute-def:emailAddress' => 'emailAddress',
-	'urn:mace:dir:attribute-def:employeeNumber' => 'employeeNumber',
-	'urn:mace:dir:attribute-def:employeeType' => 'employeeType',
-	'urn:mace:dir:attribute-def:enhancedSearchGuide' => 'enhancedSearchGuide',
-	'urn:mace:dir:attribute-def:facsimileTelephoneNumber' => 'facsimileTelephoneNumber',
-	'urn:mace:dir:attribute-def:favouriteDrink' => 'favouriteDrink',
-	'urn:mace:dir:attribute-def:fax' => 'fax',
-	'urn:mace:dir:attribute-def:federationFeideSchemaVersion' => 'federationFeideSchemaVersion',
-	'urn:mace:dir:attribute-def:friendlyCountryName' => 'friendlyCountryName',
-	'urn:mace:dir:attribute-def:generationQualifier' => 'generationQualifier',
-	'urn:mace:dir:attribute-def:givenName' => 'givenName',
-	'urn:mace:dir:attribute-def:gn' => 'gn',
-	'urn:mace:dir:attribute-def:homePhone' => 'homePhone',
-	'urn:mace:dir:attribute-def:homePostalAddress' => 'homePostalAddress',
-	'urn:mace:dir:attribute-def:homeTelephoneNumber' => 'homeTelephoneNumber',
-	'urn:mace:dir:attribute-def:host' => 'host',
-	'urn:mace:dir:attribute-def:houseIdentifier' => 'houseIdentifier',
-	'urn:mace:dir:attribute-def:info' => 'info',
-	'urn:mace:dir:attribute-def:initials' => 'initials',
-	'urn:mace:dir:attribute-def:internationaliSDNNumber' => 'internationaliSDNNumber',
-	'urn:mace:dir:attribute-def:janetMailbox' => 'janetMailbox',
-	'urn:mace:dir:attribute-def:jpegPhoto' => 'jpegPhoto',
-	'urn:mace:dir:attribute-def:knowledgeInformation' => 'knowledgeInformation',
-	'urn:mace:dir:attribute-def:l' => 'l',
-	'urn:mace:dir:attribute-def:labeledURI' => 'labeledURI',
-	'urn:mace:dir:attribute-def:localityName' => 'localityName',
-	'urn:mace:dir:attribute-def:mDRecord' => 'mDRecord',
-	'urn:mace:dir:attribute-def:mXRecord' => 'mXRecord',
-	'urn:mace:dir:attribute-def:mail' => 'mail',
-	'urn:mace:dir:attribute-def:mailPreferenceOption' => 'mailPreferenceOption',
-	'urn:mace:dir:attribute-def:manager' => 'manager',
-	'urn:mace:dir:attribute-def:member' => 'member',
-	'urn:mace:dir:attribute-def:mobile' => 'mobile',
-	'urn:mace:dir:attribute-def:mobileTelephoneNumber' => 'mobileTelephoneNumber',
-	'urn:mace:dir:attribute-def:nSRecord' => 'nSRecord',
-	'urn:mace:dir:attribute-def:name' => 'name',
-	'urn:mace:dir:attribute-def:norEduOrgAcronym' => 'norEduOrgAcronym',
-	'urn:mace:dir:attribute-def:norEduOrgNIN' => 'norEduOrgNIN',
-	'urn:mace:dir:attribute-def:norEduOrgSchemaVersion' => 'norEduOrgSchemaVersion',
-	'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier' => 'norEduOrgUniqueIdentifier',
-	'urn:mace:dir:attribute-def:norEduOrgUniqueNumber' => 'norEduOrgUniqueNumber',
-	'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier' => 'norEduOrgUnitUniqueIdentifier',
-	'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber' => 'norEduOrgUnitUniqueNumber',
-	'urn:mace:dir:attribute-def:norEduPersonBirthDate' => 'norEduPersonBirthDate',
-	'urn:mace:dir:attribute-def:norEduPersonLIN' => 'norEduPersonLIN',
-	'urn:mace:dir:attribute-def:norEduPersonNIN' => 'norEduPersonNIN',
-	'urn:mace:dir:attribute-def:o' => 'o',
-	'urn:mace:dir:attribute-def:objectClass' => 'objectClass',
-	'urn:mace:dir:attribute-def:organizationName' => 'organizationName',
-	'urn:mace:dir:attribute-def:organizationalStatus' => 'organizationalStatus',
-	'urn:mace:dir:attribute-def:organizationalUnitName' => 'organizationalUnitName',
-	'urn:mace:dir:attribute-def:otherMailbox' => 'otherMailbox',
-	'urn:mace:dir:attribute-def:ou' => 'ou',
-	'urn:mace:dir:attribute-def:owner' => 'owner',
-	'urn:mace:dir:attribute-def:pager' => 'pager',
-	'urn:mace:dir:attribute-def:pagerTelephoneNumber' => 'pagerTelephoneNumber',
-	'urn:mace:dir:attribute-def:personalSignature' => 'personalSignature',
-	'urn:mace:dir:attribute-def:personalTitle' => 'personalTitle',
-	'urn:mace:dir:attribute-def:photo' => 'photo',
-	'urn:mace:dir:attribute-def:physicalDeliveryOfficeName' => 'physicalDeliveryOfficeName',
-	'urn:mace:dir:attribute-def:pkcs9email' => 'pkcs9email',
-	'urn:mace:dir:attribute-def:postOfficeBox' => 'postOfficeBox',
-	'urn:mace:dir:attribute-def:postalAddress' => 'postalAddress',
-	'urn:mace:dir:attribute-def:postalCode' => 'postalCode',
-	'urn:mace:dir:attribute-def:preferredDeliveryMethod' => 'preferredDeliveryMethod',
-	'urn:mace:dir:attribute-def:preferredLanguage' => 'preferredLanguage',
-	'urn:mace:dir:attribute-def:presentationAddress' => 'presentationAddress',
-	'urn:mace:dir:attribute-def:protocolInformation' => 'protocolInformation',
-	'urn:mace:dir:attribute-def:pseudonym' => 'pseudonym',
-	'urn:mace:dir:attribute-def:registeredAddress' => 'registeredAddress',
-	'urn:mace:dir:attribute-def:rfc822Mailbox' => 'rfc822Mailbox',
-	'urn:mace:dir:attribute-def:roleOccupant' => 'roleOccupant',
-	'urn:mace:dir:attribute-def:roomNumber' => 'roomNumber',
-	'urn:mace:dir:attribute-def:sOARecord' => 'sOARecord',
-	'urn:mace:dir:attribute-def:schacGender' => 'schacGender',
-	'urn:mace:dir:attribute-def:searchGuide' => 'searchGuide',
-	'urn:mace:dir:attribute-def:secretary' => 'secretary',
-	'urn:mace:dir:attribute-def:seeAlso' => 'seeAlso',
-	'urn:mace:dir:attribute-def:serialNumber' => 'serialNumber',
-	'urn:mace:dir:attribute-def:singleLevelQuality' => 'singleLevelQuality',
-	'urn:mace:dir:attribute-def:sisSchoolGrade' =>'sisSchoolGrade',
-	'urn:mace:dir:attribute-def:sisLegalGuardianFor' => 'sisLegalGuardianFor',
-	'urn:mace:dir:attribute-def:sn' => 'sn',
-	'urn:mace:dir:attribute-def:st' => 'st',
-	'urn:mace:dir:attribute-def:stateOrProvinceName' => 'stateOrProvinceName',
-	'urn:mace:dir:attribute-def:street' => 'street',
-	'urn:mace:dir:attribute-def:streetAddress' => 'streetAddress',
-	'urn:mace:dir:attribute-def:subtreeMaximumQuality' => 'subtreeMaximumQuality',
-	'urn:mace:dir:attribute-def:subtreeMinimumQuality' => 'subtreeMinimumQuality',
-	'urn:mace:dir:attribute-def:supportedAlgorithms' => 'supportedAlgorithms',
-	'urn:mace:dir:attribute-def:supportedApplicationContext' => 'supportedApplicationContext',
-	'urn:mace:dir:attribute-def:surname' => 'surname',
-	'urn:mace:dir:attribute-def:telephoneNumber' => 'telephoneNumber',
-	'urn:mace:dir:attribute-def:teletexTerminalIdentifier' => 'teletexTerminalIdentifier',
-	'urn:mace:dir:attribute-def:telexNumber' => 'telexNumber',
-	'urn:mace:dir:attribute-def:textEncodedORAddress' => 'textEncodedORAddress',
-	'urn:mace:dir:attribute-def:title' => 'title',
-	'urn:mace:dir:attribute-def:uid' => 'uid',
-	'urn:mace:dir:attribute-def:uniqueIdentifier' => 'uniqueIdentifier',
-	'urn:mace:dir:attribute-def:uniqueMember' => 'uniqueMember',
-	'urn:mace:dir:attribute-def:userCertificate' => 'userCertificate',
-	'urn:mace:dir:attribute-def:userClass' => 'userClass',
-	'urn:mace:dir:attribute-def:userPKCS12' => 'userPKCS12',
-	'urn:mace:dir:attribute-def:userPassword' => 'userPassword',
-	'urn:mace:dir:attribute-def:userSMIMECertificate' => 'userSMIMECertificate',
-	'urn:mace:dir:attribute-def:userid' => 'userid',
-	'urn:mace:dir:attribute-def:x121Address' => 'x121Address',
-	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'x500UniqueIdentifier',
-	'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'schacCountryOfCitizenship',
-	'urn:mace:terena.org:attribute-def:schacCountryOfResidence' => 'schacCountryOfResidence',
-	'urn:mace:terena.org:attribute-def:schacDateOfBirth' => 'schacDateOfBirth',
-	'urn:mace:terena.org:attribute-def:schacExpiryDate' => 'schacExpiryDate',
-	'urn:mace:terena.org:attribute-def:schacGender' => 'schacGender',
-	'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'schacHomeOrganization',
-	'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'schacHomeOrganizationType',
-	'urn:mace:terena.org:attribute-def:schacMotherTongue' => 'schacMotherTongue',
-	'urn:mace:terena.org:attribute-def:schacPersonalPosition' => 'schacPersonalPosition',
-	'urn:mace:terena.org:attribute-def:schacPersonalTitle' => 'schacPersonalTitle',
-	'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode' => 'schacPersonalUniqueCode',
-	'urn:mace:terena.org:attribute-def:schacPersonalUniqueID' => 'schacPersonalUniqueID',
-	'urn:mace:terena.org:attribute-def:schacPlaceOfBirth' => 'schacPlaceOfBirth',
-	'urn:mace:terena.org:attribute-def:schacProjectMembership' => 'schacProjectMembership',
-	'urn:mace:terena.org:attribute-def:schacProjectSpecificRole' => 'schacProjectSpecificRole',
-	'urn:mace:terena.org:attribute-def:schacSn1' => 'schacSn1',
-	'urn:mace:terena.org:attribute-def:schacSn2' => 'schacSn2',
-	'urn:mace:terena.org:attribute-def:schacUserPresenceID' => 'schacUserPresenceID',
-	'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'schacUserPrivateAttribute',
-	'urn:mace:terena.org:attribute-def:schacUserStatus' => 'schacUserStatus',
+    'urn:mace:dir:attribute-def:aRecord'                          => 'aRecord',
+    'urn:mace:dir:attribute-def:aliasedEntryName'                 => 'aliasedEntryName',
+    'urn:mace:dir:attribute-def:aliasedObjectName'                => 'aliasedObjectName',
+    'urn:mace:dir:attribute-def:associatedDomain'                 => 'associatedDomain',
+    'urn:mace:dir:attribute-def:associatedName'                   => 'associatedName',
+    'urn:mace:dir:attribute-def:audio'                            => 'audio',
+    'urn:mace:dir:attribute-def:authorityRevocationList'          => 'authorityRevocationList',
+    'urn:mace:dir:attribute-def:buildingName'                     => 'buildingName',
+    'urn:mace:dir:attribute-def:businessCategory'                 => 'businessCategory',
+    'urn:mace:dir:attribute-def:c'                                => 'c',
+    'urn:mace:dir:attribute-def:cACertificate'                    => 'cACertificate',
+    'urn:mace:dir:attribute-def:cNAMERecord'                      => 'cNAMERecord',
+    'urn:mace:dir:attribute-def:carLicense'                       => 'carLicense',
+    'urn:mace:dir:attribute-def:certificateRevocationList'        => 'certificateRevocationList',
+    'urn:mace:dir:attribute-def:cn'                               => 'cn',
+    'urn:mace:dir:attribute-def:co'                               => 'co',
+    'urn:mace:dir:attribute-def:commonName'                       => 'commonName',
+    'urn:mace:dir:attribute-def:countryName'                      => 'countryName',
+    'urn:mace:dir:attribute-def:crossCertificatePair'             => 'crossCertificatePair',
+    'urn:mace:dir:attribute-def:dITRedirect'                      => 'dITRedirect',
+    'urn:mace:dir:attribute-def:dSAQuality'                       => 'dSAQuality',
+    'urn:mace:dir:attribute-def:dc'                               => 'dc',
+    'urn:mace:dir:attribute-def:deltaRevocationList'              => 'deltaRevocationList',
+    'urn:mace:dir:attribute-def:departmentNumber'                 => 'departmentNumber',
+    'urn:mace:dir:attribute-def:description'                      => 'description',
+    'urn:mace:dir:attribute-def:destinationIndicator'             => 'destinationIndicator',
+    'urn:mace:dir:attribute-def:displayName'                      => 'displayName',
+    'urn:mace:dir:attribute-def:distinguishedName'                => 'distinguishedName',
+    'urn:mace:dir:attribute-def:dmdName'                          => 'dmdName',
+    'urn:mace:dir:attribute-def:dnQualifier'                      => 'dnQualifier',
+    'urn:mace:dir:attribute-def:documentAuthor'                   => 'documentAuthor',
+    'urn:mace:dir:attribute-def:documentIdentifier'               => 'documentIdentifier',
+    'urn:mace:dir:attribute-def:documentLocation'                 => 'documentLocation',
+    'urn:mace:dir:attribute-def:documentPublisher'                => 'documentPublisher',
+    'urn:mace:dir:attribute-def:documentTitle'                    => 'documentTitle',
+    'urn:mace:dir:attribute-def:documentVersion'                  => 'documentVersion',
+    'urn:mace:dir:attribute-def:domainComponent'                  => 'domainComponent',
+    'urn:mace:dir:attribute-def:drink'                            => 'drink',
+    'urn:mace:dir:attribute-def:eduOrgHomePageURI'                => 'eduOrgHomePageURI',
+    'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI'     => 'eduOrgIdentityAuthNPolicyURI',
+    'urn:mace:dir:attribute-def:eduOrgLegalName'                  => 'eduOrgLegalName',
+    'urn:mace:dir:attribute-def:eduOrgSuperiorURI'                => 'eduOrgSuperiorURI',
+    'urn:mace:dir:attribute-def:eduOrgWhitePagesURI'              => 'eduOrgWhitePagesURI',
+    'urn:mace:dir:attribute-def:eduPersonAffiliation'             => 'eduPersonAffiliation',
+    'urn:mace:dir:attribute-def:eduPersonAssurance'               => 'eduPersonAssurance',
+    'urn:mace:dir:attribute-def:eduPersonEntitlement'             => 'eduPersonEntitlement',
+    'urn:mace:dir:attribute-def:eduPersonNickname'                => 'eduPersonNickname',
+    'urn:mace:dir:attribute-def:eduPersonOrgDN'                   => 'eduPersonOrgDN',
+    'urn:mace:dir:attribute-def:eduPersonOrgUnitDN'               => 'eduPersonOrgUnitDN',
+    'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation'      => 'eduPersonPrimaryAffiliation',
+    'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN'        => 'eduPersonPrimaryOrgUnitDN',
+    'urn:mace:dir:attribute-def:eduPersonPrincipalName'           => 'eduPersonPrincipalName',
+    'urn:mace:dir:attribute-def:eduPersonScopedAffiliation'       => 'eduPersonScopedAffiliation',
+    'urn:mace:dir:attribute-def:eduPersonTargetedID'              => 'eduPersonTargetedID',
+    'urn:mace:dir:attribute-def:email'                            => 'email',
+    'urn:mace:dir:attribute-def:emailAddress'                     => 'emailAddress',
+    'urn:mace:dir:attribute-def:employeeNumber'                   => 'employeeNumber',
+    'urn:mace:dir:attribute-def:employeeType'                     => 'employeeType',
+    'urn:mace:dir:attribute-def:enhancedSearchGuide'              => 'enhancedSearchGuide',
+    'urn:mace:dir:attribute-def:facsimileTelephoneNumber'         => 'facsimileTelephoneNumber',
+    'urn:mace:dir:attribute-def:favouriteDrink'                   => 'favouriteDrink',
+    'urn:mace:dir:attribute-def:fax'                              => 'fax',
+    'urn:mace:dir:attribute-def:federationFeideSchemaVersion'     => 'federationFeideSchemaVersion',
+    'urn:mace:dir:attribute-def:friendlyCountryName'              => 'friendlyCountryName',
+    'urn:mace:dir:attribute-def:generationQualifier'              => 'generationQualifier',
+    'urn:mace:dir:attribute-def:givenName'                        => 'givenName',
+    'urn:mace:dir:attribute-def:gn'                               => 'gn',
+    'urn:mace:dir:attribute-def:homePhone'                        => 'homePhone',
+    'urn:mace:dir:attribute-def:homePostalAddress'                => 'homePostalAddress',
+    'urn:mace:dir:attribute-def:homeTelephoneNumber'              => 'homeTelephoneNumber',
+    'urn:mace:dir:attribute-def:host'                             => 'host',
+    'urn:mace:dir:attribute-def:houseIdentifier'                  => 'houseIdentifier',
+    'urn:mace:dir:attribute-def:info'                             => 'info',
+    'urn:mace:dir:attribute-def:initials'                         => 'initials',
+    'urn:mace:dir:attribute-def:internationaliSDNNumber'          => 'internationaliSDNNumber',
+    'urn:mace:dir:attribute-def:janetMailbox'                     => 'janetMailbox',
+    'urn:mace:dir:attribute-def:jpegPhoto'                        => 'jpegPhoto',
+    'urn:mace:dir:attribute-def:knowledgeInformation'             => 'knowledgeInformation',
+    'urn:mace:dir:attribute-def:l'                                => 'l',
+    'urn:mace:dir:attribute-def:labeledURI'                       => 'labeledURI',
+    'urn:mace:dir:attribute-def:localityName'                     => 'localityName',
+    'urn:mace:dir:attribute-def:mDRecord'                         => 'mDRecord',
+    'urn:mace:dir:attribute-def:mXRecord'                         => 'mXRecord',
+    'urn:mace:dir:attribute-def:mail'                             => 'mail',
+    'urn:mace:dir:attribute-def:mailPreferenceOption'             => 'mailPreferenceOption',
+    'urn:mace:dir:attribute-def:manager'                          => 'manager',
+    'urn:mace:dir:attribute-def:member'                           => 'member',
+    'urn:mace:dir:attribute-def:mobile'                           => 'mobile',
+    'urn:mace:dir:attribute-def:mobileTelephoneNumber'            => 'mobileTelephoneNumber',
+    'urn:mace:dir:attribute-def:nSRecord'                         => 'nSRecord',
+    'urn:mace:dir:attribute-def:name'                             => 'name',
+    'urn:mace:dir:attribute-def:norEduOrgAcronym'                 => 'norEduOrgAcronym',
+    'urn:mace:dir:attribute-def:norEduOrgNIN'                     => 'norEduOrgNIN',
+    'urn:mace:dir:attribute-def:norEduOrgSchemaVersion'           => 'norEduOrgSchemaVersion',
+    'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier'        => 'norEduOrgUniqueIdentifier',
+    'urn:mace:dir:attribute-def:norEduOrgUniqueNumber'            => 'norEduOrgUniqueNumber',
+    'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier'    => 'norEduOrgUnitUniqueIdentifier',
+    'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber'        => 'norEduOrgUnitUniqueNumber',
+    'urn:mace:dir:attribute-def:norEduPersonBirthDate'            => 'norEduPersonBirthDate',
+    'urn:mace:dir:attribute-def:norEduPersonLIN'                  => 'norEduPersonLIN',
+    'urn:mace:dir:attribute-def:norEduPersonNIN'                  => 'norEduPersonNIN',
+    'urn:mace:dir:attribute-def:o'                                => 'o',
+    'urn:mace:dir:attribute-def:objectClass'                      => 'objectClass',
+    'urn:mace:dir:attribute-def:organizationName'                 => 'organizationName',
+    'urn:mace:dir:attribute-def:organizationalStatus'             => 'organizationalStatus',
+    'urn:mace:dir:attribute-def:organizationalUnitName'           => 'organizationalUnitName',
+    'urn:mace:dir:attribute-def:otherMailbox'                     => 'otherMailbox',
+    'urn:mace:dir:attribute-def:ou'                               => 'ou',
+    'urn:mace:dir:attribute-def:owner'                            => 'owner',
+    'urn:mace:dir:attribute-def:pager'                            => 'pager',
+    'urn:mace:dir:attribute-def:pagerTelephoneNumber'             => 'pagerTelephoneNumber',
+    'urn:mace:dir:attribute-def:personalSignature'                => 'personalSignature',
+    'urn:mace:dir:attribute-def:personalTitle'                    => 'personalTitle',
+    'urn:mace:dir:attribute-def:photo'                            => 'photo',
+    'urn:mace:dir:attribute-def:physicalDeliveryOfficeName'       => 'physicalDeliveryOfficeName',
+    'urn:mace:dir:attribute-def:pkcs9email'                       => 'pkcs9email',
+    'urn:mace:dir:attribute-def:postOfficeBox'                    => 'postOfficeBox',
+    'urn:mace:dir:attribute-def:postalAddress'                    => 'postalAddress',
+    'urn:mace:dir:attribute-def:postalCode'                       => 'postalCode',
+    'urn:mace:dir:attribute-def:preferredDeliveryMethod'          => 'preferredDeliveryMethod',
+    'urn:mace:dir:attribute-def:preferredLanguage'                => 'preferredLanguage',
+    'urn:mace:dir:attribute-def:presentationAddress'              => 'presentationAddress',
+    'urn:mace:dir:attribute-def:protocolInformation'              => 'protocolInformation',
+    'urn:mace:dir:attribute-def:pseudonym'                        => 'pseudonym',
+    'urn:mace:dir:attribute-def:registeredAddress'                => 'registeredAddress',
+    'urn:mace:dir:attribute-def:rfc822Mailbox'                    => 'rfc822Mailbox',
+    'urn:mace:dir:attribute-def:roleOccupant'                     => 'roleOccupant',
+    'urn:mace:dir:attribute-def:roomNumber'                       => 'roomNumber',
+    'urn:mace:dir:attribute-def:sOARecord'                        => 'sOARecord',
+    'urn:mace:dir:attribute-def:schacGender'                      => 'schacGender',
+    'urn:mace:dir:attribute-def:searchGuide'                      => 'searchGuide',
+    'urn:mace:dir:attribute-def:secretary'                        => 'secretary',
+    'urn:mace:dir:attribute-def:seeAlso'                          => 'seeAlso',
+    'urn:mace:dir:attribute-def:serialNumber'                     => 'serialNumber',
+    'urn:mace:dir:attribute-def:singleLevelQuality'               => 'singleLevelQuality',
+    'urn:mace:dir:attribute-def:sisSchoolGrade'                   => 'sisSchoolGrade',
+    'urn:mace:dir:attribute-def:sisLegalGuardianFor'              => 'sisLegalGuardianFor',
+    'urn:mace:dir:attribute-def:sn'                               => 'sn',
+    'urn:mace:dir:attribute-def:st'                               => 'st',
+    'urn:mace:dir:attribute-def:stateOrProvinceName'              => 'stateOrProvinceName',
+    'urn:mace:dir:attribute-def:street'                           => 'street',
+    'urn:mace:dir:attribute-def:streetAddress'                    => 'streetAddress',
+    'urn:mace:dir:attribute-def:subtreeMaximumQuality'            => 'subtreeMaximumQuality',
+    'urn:mace:dir:attribute-def:subtreeMinimumQuality'            => 'subtreeMinimumQuality',
+    'urn:mace:dir:attribute-def:supportedAlgorithms'              => 'supportedAlgorithms',
+    'urn:mace:dir:attribute-def:supportedApplicationContext'      => 'supportedApplicationContext',
+    'urn:mace:dir:attribute-def:surname'                          => 'surname',
+    'urn:mace:dir:attribute-def:telephoneNumber'                  => 'telephoneNumber',
+    'urn:mace:dir:attribute-def:teletexTerminalIdentifier'        => 'teletexTerminalIdentifier',
+    'urn:mace:dir:attribute-def:telexNumber'                      => 'telexNumber',
+    'urn:mace:dir:attribute-def:textEncodedORAddress'             => 'textEncodedORAddress',
+    'urn:mace:dir:attribute-def:title'                            => 'title',
+    'urn:mace:dir:attribute-def:uid'                              => 'uid',
+    'urn:mace:dir:attribute-def:uniqueIdentifier'                 => 'uniqueIdentifier',
+    'urn:mace:dir:attribute-def:uniqueMember'                     => 'uniqueMember',
+    'urn:mace:dir:attribute-def:userCertificate'                  => 'userCertificate',
+    'urn:mace:dir:attribute-def:userClass'                        => 'userClass',
+    'urn:mace:dir:attribute-def:userPKCS12'                       => 'userPKCS12',
+    'urn:mace:dir:attribute-def:userPassword'                     => 'userPassword',
+    'urn:mace:dir:attribute-def:userSMIMECertificate'             => 'userSMIMECertificate',
+    'urn:mace:dir:attribute-def:userid'                           => 'userid',
+    'urn:mace:dir:attribute-def:x121Address'                      => 'x121Address',
+    'urn:mace:dir:attribute-def:x500UniqueIdentifier'             => 'x500UniqueIdentifier',
+    'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'schacCountryOfCitizenship',
+    'urn:mace:terena.org:attribute-def:schacCountryOfResidence'   => 'schacCountryOfResidence',
+    'urn:mace:terena.org:attribute-def:schacDateOfBirth'          => 'schacDateOfBirth',
+    'urn:mace:terena.org:attribute-def:schacExpiryDate'           => 'schacExpiryDate',
+    'urn:mace:terena.org:attribute-def:schacGender'               => 'schacGender',
+    'urn:mace:terena.org:attribute-def:schacHomeOrganization'     => 'schacHomeOrganization',
+    'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'schacHomeOrganizationType',
+    'urn:mace:terena.org:attribute-def:schacMotherTongue'         => 'schacMotherTongue',
+    'urn:mace:terena.org:attribute-def:schacPersonalPosition'     => 'schacPersonalPosition',
+    'urn:mace:terena.org:attribute-def:schacPersonalTitle'        => 'schacPersonalTitle',
+    'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode'   => 'schacPersonalUniqueCode',
+    'urn:mace:terena.org:attribute-def:schacPersonalUniqueID'     => 'schacPersonalUniqueID',
+    'urn:mace:terena.org:attribute-def:schacPlaceOfBirth'         => 'schacPlaceOfBirth',
+    'urn:mace:terena.org:attribute-def:schacProjectMembership'    => 'schacProjectMembership',
+    'urn:mace:terena.org:attribute-def:schacProjectSpecificRole'  => 'schacProjectSpecificRole',
+    'urn:mace:terena.org:attribute-def:schacSn1'                  => 'schacSn1',
+    'urn:mace:terena.org:attribute-def:schacSn2'                  => 'schacSn2',
+    'urn:mace:terena.org:attribute-def:schacUserPresenceID'       => 'schacUserPresenceID',
+    'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'schacUserPrivateAttribute',
+    'urn:mace:terena.org:attribute-def:schacUserStatus'           => 'schacUserStatus',
 );
diff --git a/attributemap/urn2oid.php b/attributemap/urn2oid.php
index 1cb48aa83..a0405938c 100644
--- a/attributemap/urn2oid.php
+++ b/attributemap/urn2oid.php
@@ -1,185 +1,185 @@
 <?php
 $attributemap = array(
-	'urn:mace:dir:attribute-def:aRecord' => 'urn:oid:0.9.2342.19200300.100.1.26',
-	'urn:mace:dir:attribute-def:aliasedEntryName' => 'urn:oid:2.5.4.1',
-	'urn:mace:dir:attribute-def:aliasedObjectName' => 'urn:oid:2.5.4.1',
-	'urn:mace:dir:attribute-def:associatedDomain' => 'urn:oid:0.9.2342.19200300.100.1.37',
-	'urn:mace:dir:attribute-def:associatedName' => 'urn:oid:0.9.2342.19200300.100.1.38',
-	'urn:mace:dir:attribute-def:audio' => 'urn:oid:0.9.2342.19200300.100.1.55',
-	'urn:mace:dir:attribute-def:authorityRevocationList' => 'urn:oid:2.5.4.38',
-	'urn:mace:dir:attribute-def:buildingName' => 'urn:oid:0.9.2342.19200300.100.1.48',
-	'urn:mace:dir:attribute-def:businessCategory' => 'urn:oid:2.5.4.15',
-	'urn:mace:dir:attribute-def:c' => 'urn:oid:2.5.4.6',
-	'urn:mace:dir:attribute-def:cACertificate' => 'urn:oid:2.5.4.37',
-	'urn:mace:dir:attribute-def:cNAMERecord' => 'urn:oid:0.9.2342.19200300.100.1.31',
-	'urn:mace:dir:attribute-def:carLicense' => 'urn:oid:2.16.840.1.113730.3.1.1',
-	'urn:mace:dir:attribute-def:certificateRevocationList' => 'urn:oid:2.5.4.39',
-	'urn:mace:dir:attribute-def:cn' => 'urn:oid:2.5.4.3',
-	'urn:mace:dir:attribute-def:co' => 'urn:oid:0.9.2342.19200300.100.1.43',
-	'urn:mace:dir:attribute-def:commonName' => 'urn:oid:2.5.4.3',
-	'urn:mace:dir:attribute-def:countryName' => 'urn:oid:2.5.4.6',
-	'urn:mace:dir:attribute-def:crossCertificatePair' => 'urn:oid:2.5.4.40',
-	'urn:mace:dir:attribute-def:dITRedirect' => 'urn:oid:0.9.2342.19200300.100.1.54',
-	'urn:mace:dir:attribute-def:dSAQuality' => 'urn:oid:0.9.2342.19200300.100.1.49',
-	'urn:mace:dir:attribute-def:dc' => 'urn:oid:0.9.2342.19200300.100.1.25',
-	'urn:mace:dir:attribute-def:deltaRevocationList' => 'urn:oid:2.5.4.53',
-	'urn:mace:dir:attribute-def:departmentNumber' => 'urn:oid:2.16.840.1.113730.3.1.2',
-	'urn:mace:dir:attribute-def:description' => 'urn:oid:2.5.4.13',
-	'urn:mace:dir:attribute-def:destinationIndicator' => 'urn:oid:2.5.4.27',
-	'urn:mace:dir:attribute-def:displayName' => 'urn:oid:2.16.840.1.113730.3.1.241',
-	'urn:mace:dir:attribute-def:distinguishedName' => 'urn:oid:2.5.4.49',
-	'urn:mace:dir:attribute-def:dmdName' => 'urn:oid:2.5.4.54',
-	'urn:mace:dir:attribute-def:dnQualifier' => 'urn:oid:2.5.4.46',
-	'urn:mace:dir:attribute-def:documentAuthor' => 'urn:oid:0.9.2342.19200300.100.1.14',
-	'urn:mace:dir:attribute-def:documentIdentifier' => 'urn:oid:0.9.2342.19200300.100.1.11',
-	'urn:mace:dir:attribute-def:documentLocation' => 'urn:oid:0.9.2342.19200300.100.1.15',
-	'urn:mace:dir:attribute-def:documentPublisher' => 'urn:oid:0.9.2342.19200300.100.1.56',
-	'urn:mace:dir:attribute-def:documentTitle' => 'urn:oid:0.9.2342.19200300.100.1.12',
-	'urn:mace:dir:attribute-def:documentVersion' => 'urn:oid:0.9.2342.19200300.100.1.13',
-	'urn:mace:dir:attribute-def:domainComponent' => 'urn:oid:0.9.2342.19200300.100.1.25',
-	'urn:mace:dir:attribute-def:drink' => 'urn:oid:0.9.2342.19200300.100.1.5',
-	'urn:mace:dir:attribute-def:eduOrgHomePageURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.2',
-	'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.3',
-	'urn:mace:dir:attribute-def:eduOrgLegalName' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.4',
-	'urn:mace:dir:attribute-def:eduOrgSuperiorURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.5',
-	'urn:mace:dir:attribute-def:eduOrgWhitePagesURI' => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.6',
-	'urn:mace:dir:attribute-def:eduPersonAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1',
-	'urn:mace:dir:attribute-def:eduPersonAssurance' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
-	'urn:mace:dir:attribute-def:eduPersonEntitlement' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
-	'urn:mace:dir:attribute-def:eduPersonNickname' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
-	'urn:mace:dir:attribute-def:eduPersonOrgDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
-	'urn:mace:dir:attribute-def:eduPersonOrgUnitDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
-	'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
-	'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.8',
-	'urn:mace:dir:attribute-def:eduPersonPrincipalName' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6',
-	'urn:mace:dir:attribute-def:eduPersonScopedAffiliation' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
-	'urn:mace:dir:attribute-def:eduPersonTargetedID' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
-	'urn:mace:dir:attribute-def:email' => 'urn:oid:1.2.840.113549.1.9.1',
-	'urn:mace:dir:attribute-def:emailAddress' => 'urn:oid:1.2.840.113549.1.9.1',
-	'urn:mace:dir:attribute-def:employeeNumber' => 'urn:oid:2.16.840.1.113730.3.1.3',
-	'urn:mace:dir:attribute-def:employeeType' => 'urn:oid:2.16.840.1.113730.3.1.4',
-	'urn:mace:dir:attribute-def:enhancedSearchGuide' => 'urn:oid:2.5.4.47',
-	'urn:mace:dir:attribute-def:facsimileTelephoneNumber' => 'urn:oid:2.5.4.23',
-	'urn:mace:dir:attribute-def:favouriteDrink' => 'urn:oid:0.9.2342.19200300.100.1.5',
-	'urn:mace:dir:attribute-def:fax' => 'urn:oid:2.5.4.23',
-	'urn:mace:dir:attribute-def:federationFeideSchemaVersion' => 'urn:oid:1.3.6.1.4.1.2428.90.1.9',
-	'urn:mace:dir:attribute-def:friendlyCountryName' => 'urn:oid:0.9.2342.19200300.100.1.43',
-	'urn:mace:dir:attribute-def:generationQualifier' => 'urn:oid:2.5.4.44',
-	'urn:mace:dir:attribute-def:givenName' => 'urn:oid:2.5.4.42',
-	'urn:mace:dir:attribute-def:gn' => 'urn:oid:2.5.4.42',
-	'urn:mace:dir:attribute-def:homePhone' => 'urn:oid:0.9.2342.19200300.100.1.20',
-	'urn:mace:dir:attribute-def:homePostalAddress' => 'urn:oid:0.9.2342.19200300.100.1.39',
-	'urn:mace:dir:attribute-def:homeTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.20',
-	'urn:mace:dir:attribute-def:host' => 'urn:oid:0.9.2342.19200300.100.1.9',
-	'urn:mace:dir:attribute-def:houseIdentifier' => 'urn:oid:2.5.4.51',
-	'urn:mace:dir:attribute-def:info' => 'urn:oid:0.9.2342.19200300.100.1.4',
-	'urn:mace:dir:attribute-def:initials' => 'urn:oid:2.5.4.43',
-	'urn:mace:dir:attribute-def:internationaliSDNNumber' => 'urn:oid:2.5.4.25',
-	'urn:mace:dir:attribute-def:janetMailbox' => 'urn:oid:0.9.2342.19200300.100.1.46',
-	'urn:mace:dir:attribute-def:jpegPhoto' => 'urn:oid:0.9.2342.19200300.100.1.60',
-	'urn:mace:dir:attribute-def:knowledgeInformation' => 'urn:oid:2.5.4.2',
-	'urn:mace:dir:attribute-def:l' => 'urn:oid:2.5.4.7',
-	'urn:mace:dir:attribute-def:labeledURI' => 'urn:oid:1.3.6.1.4.1.250.1.57',
-	'urn:mace:dir:attribute-def:localityName' => 'urn:oid:2.5.4.7',
-	'urn:mace:dir:attribute-def:mDRecord' => 'urn:oid:0.9.2342.19200300.100.1.27',
-	'urn:mace:dir:attribute-def:mXRecord' => 'urn:oid:0.9.2342.19200300.100.1.28',
-	'urn:mace:dir:attribute-def:mail' => 'urn:oid:0.9.2342.19200300.100.1.3',
-	'urn:mace:dir:attribute-def:mailPreferenceOption' => 'urn:oid:0.9.2342.19200300.100.1.47',
-	'urn:mace:dir:attribute-def:manager' => 'urn:oid:0.9.2342.19200300.100.1.10',
-	'urn:mace:dir:attribute-def:member' => 'urn:oid:2.5.4.31',
-	'urn:mace:dir:attribute-def:mobile' => 'urn:oid:0.9.2342.19200300.100.1.41',
-	'urn:mace:dir:attribute-def:mobileTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.41',
-	'urn:mace:dir:attribute-def:nSRecord' => 'urn:oid:0.9.2342.19200300.100.1.29',
-	'urn:mace:dir:attribute-def:name' => 'urn:oid:2.5.4.41',
-	'urn:mace:dir:attribute-def:norEduOrgAcronym' => 'urn:oid:1.3.6.1.4.1.2428.90.1.6',
-	'urn:mace:dir:attribute-def:norEduOrgNIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.12',
-	'urn:mace:dir:attribute-def:norEduOrgSchemaVersion' => 'urn:oid:1.3.6.1.4.1.2428.90.1.11',
-	'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier' => 'urn:oid:1.3.6.1.4.1.2428.90.1.7',
-	'urn:mace:dir:attribute-def:norEduOrgUniqueNumber' => 'urn:oid:1.3.6.1.4.1.2428.90.1.1',
-	'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier' => 'urn:oid:1.3.6.1.4.1.2428.90.1.8',
-	'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber' => 'urn:oid:1.3.6.1.4.1.2428.90.1.2',
-	'urn:mace:dir:attribute-def:norEduPersonBirthDate' => 'urn:oid:1.3.6.1.4.1.2428.90.1.3',
-	'urn:mace:dir:attribute-def:norEduPersonLIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.4',
-	'urn:mace:dir:attribute-def:norEduPersonNIN' => 'urn:oid:1.3.6.1.4.1.2428.90.1.5',
-	'urn:mace:dir:attribute-def:o' => 'urn:oid:2.5.4.10',
-	'urn:mace:dir:attribute-def:objectClass' => 'urn:oid:2.5.4.0',
-	'urn:mace:dir:attribute-def:organizationName' => 'urn:oid:2.5.4.10',
-	'urn:mace:dir:attribute-def:organizationalStatus' => 'urn:oid:0.9.2342.19200300.100.1.45',
-	'urn:mace:dir:attribute-def:organizationalUnitName' => 'urn:oid:2.5.4.11',
-	'urn:mace:dir:attribute-def:otherMailbox' => 'urn:oid:0.9.2342.19200300.100.1.22',
-	'urn:mace:dir:attribute-def:ou' => 'urn:oid:2.5.4.11',
-	'urn:mace:dir:attribute-def:owner' => 'urn:oid:2.5.4.32',
-	'urn:mace:dir:attribute-def:pager' => 'urn:oid:0.9.2342.19200300.100.1.42',
-	'urn:mace:dir:attribute-def:pagerTelephoneNumber' => 'urn:oid:0.9.2342.19200300.100.1.42',
-	'urn:mace:dir:attribute-def:personalSignature' => 'urn:oid:0.9.2342.19200300.100.1.53',
-	'urn:mace:dir:attribute-def:personalTitle' => 'urn:oid:0.9.2342.19200300.100.1.40',
-	'urn:mace:dir:attribute-def:photo' => 'urn:oid:0.9.2342.19200300.100.1.7',
-	'urn:mace:dir:attribute-def:physicalDeliveryOfficeName' => 'urn:oid:2.5.4.19',
-	'urn:mace:dir:attribute-def:pkcs9email' => 'urn:oid:1.2.840.113549.1.9.1',
-	'urn:mace:dir:attribute-def:postOfficeBox' => 'urn:oid:2.5.4.18',
-	'urn:mace:dir:attribute-def:postalAddress' => 'urn:oid:2.5.4.16',
-	'urn:mace:dir:attribute-def:postalCode' => 'urn:oid:2.5.4.17',
-	'urn:mace:dir:attribute-def:preferredDeliveryMethod' => 'urn:oid:2.5.4.28',
-	'urn:mace:dir:attribute-def:preferredLanguage' => 'urn:oid:2.16.840.1.113730.3.1.39',
-	'urn:mace:dir:attribute-def:presentationAddress' => 'urn:oid:2.5.4.29',
-	'urn:mace:dir:attribute-def:protocolInformation' => 'urn:oid:2.5.4.48',
-	'urn:mace:dir:attribute-def:pseudonym' => 'urn:oid:2.5.4.65',
-	'urn:mace:dir:attribute-def:registeredAddress' => 'urn:oid:2.5.4.26',
-	'urn:mace:dir:attribute-def:rfc822Mailbox' => 'urn:oid:0.9.2342.19200300.100.1.3',
-	'urn:mace:dir:attribute-def:roleOccupant' => 'urn:oid:2.5.4.33',
-	'urn:mace:dir:attribute-def:roomNumber' => 'urn:oid:0.9.2342.19200300.100.1.6',
-	'urn:mace:dir:attribute-def:sOARecord' => 'urn:oid:0.9.2342.19200300.100.1.30',
-	'urn:mace:dir:attribute-def:searchGuide' => 'urn:oid:2.5.4.14',
-	'urn:mace:dir:attribute-def:secretary' => 'urn:oid:0.9.2342.19200300.100.1.21',
-	'urn:mace:dir:attribute-def:seeAlso' => 'urn:oid:2.5.4.34',
-	'urn:mace:dir:attribute-def:serialNumber' => 'urn:oid:2.5.4.5',
-	'urn:mace:dir:attribute-def:singleLevelQuality' => 'urn:oid:0.9.2342.19200300.100.1.50',
-	'urn:mace:dir:attribute-def:sisSchoolGrade' =>'urn:oid:1.2.752.194.10.2.2',
-	'urn:mace:dir:attribute-def:sisLegalGuardianFor' => 'urn:oid:1.2.752.194.10.2.1',
-	'urn:mace:dir:attribute-def:sn' => 'urn:oid:2.5.4.4',
-	'urn:mace:dir:attribute-def:st' => 'urn:oid:2.5.4.8',
-	'urn:mace:dir:attribute-def:stateOrProvinceName' => 'urn:oid:2.5.4.8',
-	'urn:mace:dir:attribute-def:street' => 'urn:oid:2.5.4.9',
-	'urn:mace:dir:attribute-def:streetAddress' => 'urn:oid:2.5.4.9',
-	'urn:mace:dir:attribute-def:subtreeMaximumQuality' => 'urn:oid:0.9.2342.19200300.100.1.52',
-	'urn:mace:dir:attribute-def:subtreeMinimumQuality' => 'urn:oid:0.9.2342.19200300.100.1.51',
-	'urn:mace:dir:attribute-def:supportedAlgorithms' => 'urn:oid:2.5.4.52',
-	'urn:mace:dir:attribute-def:supportedApplicationContext' => 'urn:oid:2.5.4.30',
-	'urn:mace:dir:attribute-def:surname' => 'urn:oid:2.5.4.4',
-	'urn:mace:dir:attribute-def:telephoneNumber' => 'urn:oid:2.5.4.20',
-	'urn:mace:dir:attribute-def:teletexTerminalIdentifier' => 'urn:oid:2.5.4.22',
-	'urn:mace:dir:attribute-def:telexNumber' => 'urn:oid:2.5.4.21',
-	'urn:mace:dir:attribute-def:textEncodedORAddress' => 'urn:oid:0.9.2342.19200300.100.1.2',
-	'urn:mace:dir:attribute-def:title' => 'urn:oid:2.5.4.12',
-	'urn:mace:dir:attribute-def:uid' => 'urn:oid:0.9.2342.19200300.100.1.1',
-	'urn:mace:dir:attribute-def:uniqueIdentifier' => 'urn:oid:0.9.2342.19200300.100.1.44',
-	'urn:mace:dir:attribute-def:uniqueMember' => 'urn:oid:2.5.4.50',
-	'urn:mace:dir:attribute-def:userCertificate' => 'urn:oid:2.5.4.36',
-	'urn:mace:dir:attribute-def:userClass' => 'urn:oid:0.9.2342.19200300.100.1.8',
-	'urn:mace:dir:attribute-def:userPKCS12' => 'urn:oid:2.16.840.1.113730.3.1.216',
-	'urn:mace:dir:attribute-def:userPassword' => 'urn:oid:2.5.4.35',
-	'urn:mace:dir:attribute-def:userSMIMECertificate' => 'urn:oid:2.16.840.1.113730.3.1.40',
-	'urn:mace:dir:attribute-def:userid' => 'urn:oid:0.9.2342.19200300.100.1.1',
-	'urn:mace:dir:attribute-def:x121Address' => 'urn:oid:2.5.4.24',
-	'urn:mace:dir:attribute-def:x500UniqueIdentifier' => 'urn:oid:2.5.4.45',
-	'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
-	'urn:mace:terena.org:attribute-def:schacCountryOfResidence' => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
-	'urn:mace:terena.org:attribute-def:schacDateOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
-	'urn:mace:terena.org:attribute-def:schacExpiryDate' => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
-	'urn:mace:terena.org:attribute-def:schacGender' => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
-	'urn:mace:terena.org:attribute-def:schacHomeOrganization' => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
-	'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
-	'urn:mace:terena.org:attribute-def:schacMotherTongue' => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
-	'urn:mace:terena.org:attribute-def:schacPersonalPosition' => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
-	'urn:mace:terena.org:attribute-def:schacPersonalTitle' => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
-	'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode' => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
-	'urn:mace:terena.org:attribute-def:schacPersonalUniqueID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
-	'urn:mace:terena.org:attribute-def:schacPlaceOfBirth' => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
-	'urn:mace:terena.org:attribute-def:schacProjectMembership' => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
-	'urn:mace:terena.org:attribute-def:schacProjectSpecificRole' => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
-	'urn:mace:terena.org:attribute-def:schacSn1' => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
-	'urn:mace:terena.org:attribute-def:schacSn2' => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
-	'urn:mace:terena.org:attribute-def:schacUserPresenceID' => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
-	'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
-	'urn:mace:terena.org:attribute-def:schacUserStatus' => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
+    'urn:mace:dir:attribute-def:aRecord'                          => 'urn:oid:0.9.2342.19200300.100.1.26',
+    'urn:mace:dir:attribute-def:aliasedEntryName'                 => 'urn:oid:2.5.4.1',
+    'urn:mace:dir:attribute-def:aliasedObjectName'                => 'urn:oid:2.5.4.1',
+    'urn:mace:dir:attribute-def:associatedDomain'                 => 'urn:oid:0.9.2342.19200300.100.1.37',
+    'urn:mace:dir:attribute-def:associatedName'                   => 'urn:oid:0.9.2342.19200300.100.1.38',
+    'urn:mace:dir:attribute-def:audio'                            => 'urn:oid:0.9.2342.19200300.100.1.55',
+    'urn:mace:dir:attribute-def:authorityRevocationList'          => 'urn:oid:2.5.4.38',
+    'urn:mace:dir:attribute-def:buildingName'                     => 'urn:oid:0.9.2342.19200300.100.1.48',
+    'urn:mace:dir:attribute-def:businessCategory'                 => 'urn:oid:2.5.4.15',
+    'urn:mace:dir:attribute-def:c'                                => 'urn:oid:2.5.4.6',
+    'urn:mace:dir:attribute-def:cACertificate'                    => 'urn:oid:2.5.4.37',
+    'urn:mace:dir:attribute-def:cNAMERecord'                      => 'urn:oid:0.9.2342.19200300.100.1.31',
+    'urn:mace:dir:attribute-def:carLicense'                       => 'urn:oid:2.16.840.1.113730.3.1.1',
+    'urn:mace:dir:attribute-def:certificateRevocationList'        => 'urn:oid:2.5.4.39',
+    'urn:mace:dir:attribute-def:cn'                               => 'urn:oid:2.5.4.3',
+    'urn:mace:dir:attribute-def:co'                               => 'urn:oid:0.9.2342.19200300.100.1.43',
+    'urn:mace:dir:attribute-def:commonName'                       => 'urn:oid:2.5.4.3',
+    'urn:mace:dir:attribute-def:countryName'                      => 'urn:oid:2.5.4.6',
+    'urn:mace:dir:attribute-def:crossCertificatePair'             => 'urn:oid:2.5.4.40',
+    'urn:mace:dir:attribute-def:dITRedirect'                      => 'urn:oid:0.9.2342.19200300.100.1.54',
+    'urn:mace:dir:attribute-def:dSAQuality'                       => 'urn:oid:0.9.2342.19200300.100.1.49',
+    'urn:mace:dir:attribute-def:dc'                               => 'urn:oid:0.9.2342.19200300.100.1.25',
+    'urn:mace:dir:attribute-def:deltaRevocationList'              => 'urn:oid:2.5.4.53',
+    'urn:mace:dir:attribute-def:departmentNumber'                 => 'urn:oid:2.16.840.1.113730.3.1.2',
+    'urn:mace:dir:attribute-def:description'                      => 'urn:oid:2.5.4.13',
+    'urn:mace:dir:attribute-def:destinationIndicator'             => 'urn:oid:2.5.4.27',
+    'urn:mace:dir:attribute-def:displayName'                      => 'urn:oid:2.16.840.1.113730.3.1.241',
+    'urn:mace:dir:attribute-def:distinguishedName'                => 'urn:oid:2.5.4.49',
+    'urn:mace:dir:attribute-def:dmdName'                          => 'urn:oid:2.5.4.54',
+    'urn:mace:dir:attribute-def:dnQualifier'                      => 'urn:oid:2.5.4.46',
+    'urn:mace:dir:attribute-def:documentAuthor'                   => 'urn:oid:0.9.2342.19200300.100.1.14',
+    'urn:mace:dir:attribute-def:documentIdentifier'               => 'urn:oid:0.9.2342.19200300.100.1.11',
+    'urn:mace:dir:attribute-def:documentLocation'                 => 'urn:oid:0.9.2342.19200300.100.1.15',
+    'urn:mace:dir:attribute-def:documentPublisher'                => 'urn:oid:0.9.2342.19200300.100.1.56',
+    'urn:mace:dir:attribute-def:documentTitle'                    => 'urn:oid:0.9.2342.19200300.100.1.12',
+    'urn:mace:dir:attribute-def:documentVersion'                  => 'urn:oid:0.9.2342.19200300.100.1.13',
+    'urn:mace:dir:attribute-def:domainComponent'                  => 'urn:oid:0.9.2342.19200300.100.1.25',
+    'urn:mace:dir:attribute-def:drink'                            => 'urn:oid:0.9.2342.19200300.100.1.5',
+    'urn:mace:dir:attribute-def:eduOrgHomePageURI'                => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.2',
+    'urn:mace:dir:attribute-def:eduOrgIdentityAuthNPolicyURI'     => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.3',
+    'urn:mace:dir:attribute-def:eduOrgLegalName'                  => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.4',
+    'urn:mace:dir:attribute-def:eduOrgSuperiorURI'                => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.5',
+    'urn:mace:dir:attribute-def:eduOrgWhitePagesURI'              => 'urn:oid:1.3.6.1.4.1.5923.1.2.1.6',
+    'urn:mace:dir:attribute-def:eduPersonAffiliation'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1',
+    'urn:mace:dir:attribute-def:eduPersonAssurance'               => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.11',
+    'urn:mace:dir:attribute-def:eduPersonEntitlement'             => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.7',
+    'urn:mace:dir:attribute-def:eduPersonNickname'                => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.2',
+    'urn:mace:dir:attribute-def:eduPersonOrgDN'                   => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.3',
+    'urn:mace:dir:attribute-def:eduPersonOrgUnitDN'               => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.4',
+    'urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation'      => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.5',
+    'urn:mace:dir:attribute-def:eduPersonPrimaryOrgUnitDN'        => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.8',
+    'urn:mace:dir:attribute-def:eduPersonPrincipalName'           => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.6',
+    'urn:mace:dir:attribute-def:eduPersonScopedAffiliation'       => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.9',
+    'urn:mace:dir:attribute-def:eduPersonTargetedID'              => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.10',
+    'urn:mace:dir:attribute-def:email'                            => 'urn:oid:1.2.840.113549.1.9.1',
+    'urn:mace:dir:attribute-def:emailAddress'                     => 'urn:oid:1.2.840.113549.1.9.1',
+    'urn:mace:dir:attribute-def:employeeNumber'                   => 'urn:oid:2.16.840.1.113730.3.1.3',
+    'urn:mace:dir:attribute-def:employeeType'                     => 'urn:oid:2.16.840.1.113730.3.1.4',
+    'urn:mace:dir:attribute-def:enhancedSearchGuide'              => 'urn:oid:2.5.4.47',
+    'urn:mace:dir:attribute-def:facsimileTelephoneNumber'         => 'urn:oid:2.5.4.23',
+    'urn:mace:dir:attribute-def:favouriteDrink'                   => 'urn:oid:0.9.2342.19200300.100.1.5',
+    'urn:mace:dir:attribute-def:fax'                              => 'urn:oid:2.5.4.23',
+    'urn:mace:dir:attribute-def:federationFeideSchemaVersion'     => 'urn:oid:1.3.6.1.4.1.2428.90.1.9',
+    'urn:mace:dir:attribute-def:friendlyCountryName'              => 'urn:oid:0.9.2342.19200300.100.1.43',
+    'urn:mace:dir:attribute-def:generationQualifier'              => 'urn:oid:2.5.4.44',
+    'urn:mace:dir:attribute-def:givenName'                        => 'urn:oid:2.5.4.42',
+    'urn:mace:dir:attribute-def:gn'                               => 'urn:oid:2.5.4.42',
+    'urn:mace:dir:attribute-def:homePhone'                        => 'urn:oid:0.9.2342.19200300.100.1.20',
+    'urn:mace:dir:attribute-def:homePostalAddress'                => 'urn:oid:0.9.2342.19200300.100.1.39',
+    'urn:mace:dir:attribute-def:homeTelephoneNumber'              => 'urn:oid:0.9.2342.19200300.100.1.20',
+    'urn:mace:dir:attribute-def:host'                             => 'urn:oid:0.9.2342.19200300.100.1.9',
+    'urn:mace:dir:attribute-def:houseIdentifier'                  => 'urn:oid:2.5.4.51',
+    'urn:mace:dir:attribute-def:info'                             => 'urn:oid:0.9.2342.19200300.100.1.4',
+    'urn:mace:dir:attribute-def:initials'                         => 'urn:oid:2.5.4.43',
+    'urn:mace:dir:attribute-def:internationaliSDNNumber'          => 'urn:oid:2.5.4.25',
+    'urn:mace:dir:attribute-def:janetMailbox'                     => 'urn:oid:0.9.2342.19200300.100.1.46',
+    'urn:mace:dir:attribute-def:jpegPhoto'                        => 'urn:oid:0.9.2342.19200300.100.1.60',
+    'urn:mace:dir:attribute-def:knowledgeInformation'             => 'urn:oid:2.5.4.2',
+    'urn:mace:dir:attribute-def:l'                                => 'urn:oid:2.5.4.7',
+    'urn:mace:dir:attribute-def:labeledURI'                       => 'urn:oid:1.3.6.1.4.1.250.1.57',
+    'urn:mace:dir:attribute-def:localityName'                     => 'urn:oid:2.5.4.7',
+    'urn:mace:dir:attribute-def:mDRecord'                         => 'urn:oid:0.9.2342.19200300.100.1.27',
+    'urn:mace:dir:attribute-def:mXRecord'                         => 'urn:oid:0.9.2342.19200300.100.1.28',
+    'urn:mace:dir:attribute-def:mail'                             => 'urn:oid:0.9.2342.19200300.100.1.3',
+    'urn:mace:dir:attribute-def:mailPreferenceOption'             => 'urn:oid:0.9.2342.19200300.100.1.47',
+    'urn:mace:dir:attribute-def:manager'                          => 'urn:oid:0.9.2342.19200300.100.1.10',
+    'urn:mace:dir:attribute-def:member'                           => 'urn:oid:2.5.4.31',
+    'urn:mace:dir:attribute-def:mobile'                           => 'urn:oid:0.9.2342.19200300.100.1.41',
+    'urn:mace:dir:attribute-def:mobileTelephoneNumber'            => 'urn:oid:0.9.2342.19200300.100.1.41',
+    'urn:mace:dir:attribute-def:nSRecord'                         => 'urn:oid:0.9.2342.19200300.100.1.29',
+    'urn:mace:dir:attribute-def:name'                             => 'urn:oid:2.5.4.41',
+    'urn:mace:dir:attribute-def:norEduOrgAcronym'                 => 'urn:oid:1.3.6.1.4.1.2428.90.1.6',
+    'urn:mace:dir:attribute-def:norEduOrgNIN'                     => 'urn:oid:1.3.6.1.4.1.2428.90.1.12',
+    'urn:mace:dir:attribute-def:norEduOrgSchemaVersion'           => 'urn:oid:1.3.6.1.4.1.2428.90.1.11',
+    'urn:mace:dir:attribute-def:norEduOrgUniqueIdentifier'        => 'urn:oid:1.3.6.1.4.1.2428.90.1.7',
+    'urn:mace:dir:attribute-def:norEduOrgUniqueNumber'            => 'urn:oid:1.3.6.1.4.1.2428.90.1.1',
+    'urn:mace:dir:attribute-def:norEduOrgUnitUniqueIdentifier'    => 'urn:oid:1.3.6.1.4.1.2428.90.1.8',
+    'urn:mace:dir:attribute-def:norEduOrgUnitUniqueNumber'        => 'urn:oid:1.3.6.1.4.1.2428.90.1.2',
+    'urn:mace:dir:attribute-def:norEduPersonBirthDate'            => 'urn:oid:1.3.6.1.4.1.2428.90.1.3',
+    'urn:mace:dir:attribute-def:norEduPersonLIN'                  => 'urn:oid:1.3.6.1.4.1.2428.90.1.4',
+    'urn:mace:dir:attribute-def:norEduPersonNIN'                  => 'urn:oid:1.3.6.1.4.1.2428.90.1.5',
+    'urn:mace:dir:attribute-def:o'                                => 'urn:oid:2.5.4.10',
+    'urn:mace:dir:attribute-def:objectClass'                      => 'urn:oid:2.5.4.0',
+    'urn:mace:dir:attribute-def:organizationName'                 => 'urn:oid:2.5.4.10',
+    'urn:mace:dir:attribute-def:organizationalStatus'             => 'urn:oid:0.9.2342.19200300.100.1.45',
+    'urn:mace:dir:attribute-def:organizationalUnitName'           => 'urn:oid:2.5.4.11',
+    'urn:mace:dir:attribute-def:otherMailbox'                     => 'urn:oid:0.9.2342.19200300.100.1.22',
+    'urn:mace:dir:attribute-def:ou'                               => 'urn:oid:2.5.4.11',
+    'urn:mace:dir:attribute-def:owner'                            => 'urn:oid:2.5.4.32',
+    'urn:mace:dir:attribute-def:pager'                            => 'urn:oid:0.9.2342.19200300.100.1.42',
+    'urn:mace:dir:attribute-def:pagerTelephoneNumber'             => 'urn:oid:0.9.2342.19200300.100.1.42',
+    'urn:mace:dir:attribute-def:personalSignature'                => 'urn:oid:0.9.2342.19200300.100.1.53',
+    'urn:mace:dir:attribute-def:personalTitle'                    => 'urn:oid:0.9.2342.19200300.100.1.40',
+    'urn:mace:dir:attribute-def:photo'                            => 'urn:oid:0.9.2342.19200300.100.1.7',
+    'urn:mace:dir:attribute-def:physicalDeliveryOfficeName'       => 'urn:oid:2.5.4.19',
+    'urn:mace:dir:attribute-def:pkcs9email'                       => 'urn:oid:1.2.840.113549.1.9.1',
+    'urn:mace:dir:attribute-def:postOfficeBox'                    => 'urn:oid:2.5.4.18',
+    'urn:mace:dir:attribute-def:postalAddress'                    => 'urn:oid:2.5.4.16',
+    'urn:mace:dir:attribute-def:postalCode'                       => 'urn:oid:2.5.4.17',
+    'urn:mace:dir:attribute-def:preferredDeliveryMethod'          => 'urn:oid:2.5.4.28',
+    'urn:mace:dir:attribute-def:preferredLanguage'                => 'urn:oid:2.16.840.1.113730.3.1.39',
+    'urn:mace:dir:attribute-def:presentationAddress'              => 'urn:oid:2.5.4.29',
+    'urn:mace:dir:attribute-def:protocolInformation'              => 'urn:oid:2.5.4.48',
+    'urn:mace:dir:attribute-def:pseudonym'                        => 'urn:oid:2.5.4.65',
+    'urn:mace:dir:attribute-def:registeredAddress'                => 'urn:oid:2.5.4.26',
+    'urn:mace:dir:attribute-def:rfc822Mailbox'                    => 'urn:oid:0.9.2342.19200300.100.1.3',
+    'urn:mace:dir:attribute-def:roleOccupant'                     => 'urn:oid:2.5.4.33',
+    'urn:mace:dir:attribute-def:roomNumber'                       => 'urn:oid:0.9.2342.19200300.100.1.6',
+    'urn:mace:dir:attribute-def:sOARecord'                        => 'urn:oid:0.9.2342.19200300.100.1.30',
+    'urn:mace:dir:attribute-def:searchGuide'                      => 'urn:oid:2.5.4.14',
+    'urn:mace:dir:attribute-def:secretary'                        => 'urn:oid:0.9.2342.19200300.100.1.21',
+    'urn:mace:dir:attribute-def:seeAlso'                          => 'urn:oid:2.5.4.34',
+    'urn:mace:dir:attribute-def:serialNumber'                     => 'urn:oid:2.5.4.5',
+    'urn:mace:dir:attribute-def:singleLevelQuality'               => 'urn:oid:0.9.2342.19200300.100.1.50',
+    'urn:mace:dir:attribute-def:sisSchoolGrade'                   => 'urn:oid:1.2.752.194.10.2.2',
+    'urn:mace:dir:attribute-def:sisLegalGuardianFor'              => 'urn:oid:1.2.752.194.10.2.1',
+    'urn:mace:dir:attribute-def:sn'                               => 'urn:oid:2.5.4.4',
+    'urn:mace:dir:attribute-def:st'                               => 'urn:oid:2.5.4.8',
+    'urn:mace:dir:attribute-def:stateOrProvinceName'              => 'urn:oid:2.5.4.8',
+    'urn:mace:dir:attribute-def:street'                           => 'urn:oid:2.5.4.9',
+    'urn:mace:dir:attribute-def:streetAddress'                    => 'urn:oid:2.5.4.9',
+    'urn:mace:dir:attribute-def:subtreeMaximumQuality'            => 'urn:oid:0.9.2342.19200300.100.1.52',
+    'urn:mace:dir:attribute-def:subtreeMinimumQuality'            => 'urn:oid:0.9.2342.19200300.100.1.51',
+    'urn:mace:dir:attribute-def:supportedAlgorithms'              => 'urn:oid:2.5.4.52',
+    'urn:mace:dir:attribute-def:supportedApplicationContext'      => 'urn:oid:2.5.4.30',
+    'urn:mace:dir:attribute-def:surname'                          => 'urn:oid:2.5.4.4',
+    'urn:mace:dir:attribute-def:telephoneNumber'                  => 'urn:oid:2.5.4.20',
+    'urn:mace:dir:attribute-def:teletexTerminalIdentifier'        => 'urn:oid:2.5.4.22',
+    'urn:mace:dir:attribute-def:telexNumber'                      => 'urn:oid:2.5.4.21',
+    'urn:mace:dir:attribute-def:textEncodedORAddress'             => 'urn:oid:0.9.2342.19200300.100.1.2',
+    'urn:mace:dir:attribute-def:title'                            => 'urn:oid:2.5.4.12',
+    'urn:mace:dir:attribute-def:uid'                              => 'urn:oid:0.9.2342.19200300.100.1.1',
+    'urn:mace:dir:attribute-def:uniqueIdentifier'                 => 'urn:oid:0.9.2342.19200300.100.1.44',
+    'urn:mace:dir:attribute-def:uniqueMember'                     => 'urn:oid:2.5.4.50',
+    'urn:mace:dir:attribute-def:userCertificate'                  => 'urn:oid:2.5.4.36',
+    'urn:mace:dir:attribute-def:userClass'                        => 'urn:oid:0.9.2342.19200300.100.1.8',
+    'urn:mace:dir:attribute-def:userPKCS12'                       => 'urn:oid:2.16.840.1.113730.3.1.216',
+    'urn:mace:dir:attribute-def:userPassword'                     => 'urn:oid:2.5.4.35',
+    'urn:mace:dir:attribute-def:userSMIMECertificate'             => 'urn:oid:2.16.840.1.113730.3.1.40',
+    'urn:mace:dir:attribute-def:userid'                           => 'urn:oid:0.9.2342.19200300.100.1.1',
+    'urn:mace:dir:attribute-def:x121Address'                      => 'urn:oid:2.5.4.24',
+    'urn:mace:dir:attribute-def:x500UniqueIdentifier'             => 'urn:oid:2.5.4.45',
+    'urn:mace:terena.org:attribute-def:schacCountryOfCitizenship' => 'urn:oid:1.3.6.1.4.1.25178.1.2.5',
+    'urn:mace:terena.org:attribute-def:schacCountryOfResidence'   => 'urn:oid:1.3.6.1.4.1.25178.1.2.11',
+    'urn:mace:terena.org:attribute-def:schacDateOfBirth'          => 'urn:oid:1.3.6.1.4.1.25178.1.2.3',
+    'urn:mace:terena.org:attribute-def:schacExpiryDate'           => 'urn:oid:1.3.6.1.4.1.25178.1.2.17',
+    'urn:mace:terena.org:attribute-def:schacGender'               => 'urn:oid:1.3.6.1.4.1.25178.1.2.2',
+    'urn:mace:terena.org:attribute-def:schacHomeOrganization'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.9',
+    'urn:mace:terena.org:attribute-def:schacHomeOrganizationType' => 'urn:oid:1.3.6.1.4.1.25178.1.2.10',
+    'urn:mace:terena.org:attribute-def:schacMotherTongue'         => 'urn:oid:1.3.6.1.4.1.25178.1.2.1',
+    'urn:mace:terena.org:attribute-def:schacPersonalPosition'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.13',
+    'urn:mace:terena.org:attribute-def:schacPersonalTitle'        => 'urn:oid:1.3.6.1.4.1.25178.1.2.8',
+    'urn:mace:terena.org:attribute-def:schacPersonalUniqueCode'   => 'urn:oid:1.3.6.1.4.1.25178.1.2.14',
+    'urn:mace:terena.org:attribute-def:schacPersonalUniqueID'     => 'urn:oid:1.3.6.1.4.1.25178.1.2.15',
+    'urn:mace:terena.org:attribute-def:schacPlaceOfBirth'         => 'urn:oid:1.3.6.1.4.1.25178.1.2.4',
+    'urn:mace:terena.org:attribute-def:schacProjectMembership'    => 'urn:oid:1.3.6.1.4.1.25178.1.2.20',
+    'urn:mace:terena.org:attribute-def:schacProjectSpecificRole'  => 'urn:oid:1.3.6.1.4.1.25178.1.2.21',
+    'urn:mace:terena.org:attribute-def:schacSn1'                  => 'urn:oid:1.3.6.1.4.1.25178.1.2.6',
+    'urn:mace:terena.org:attribute-def:schacSn2'                  => 'urn:oid:1.3.6.1.4.1.25178.1.2.7',
+    'urn:mace:terena.org:attribute-def:schacUserPresenceID'       => 'urn:oid:1.3.6.1.4.1.25178.1.2.12',
+    'urn:mace:terena.org:attribute-def:schacUserPrivateAttribute' => 'urn:oid:1.3.6.1.4.1.25178.1.2.18',
+    'urn:mace:terena.org:attribute-def:schacUserStatus'           => 'urn:oid:1.3.6.1.4.1.25178.1.2.19',
 );
-- 
GitLab