http://www.swamid.se/category/eu-adequate-protection added to all SP:s with http://www.swamid.se/category/research-and-education

SWAMIDOPS-7176

128 files changed, 128 insertions, 0 deletions

diff --git a/swamid-2.0/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml
index f07836f7..e483bf25 100644
--- a/swamid-2.0/account.liu.se-shibboleth-sp.xml
+++ b/swamid-2.0/account.liu.se-shibboleth-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/account.mdh.se-shibboleth.xml b/swamid-2.0/account.mdh.se-shibboleth.xml
index 9658adc2..6ecfd33d 100644
--- a/swamid-2.0/account.mdh.se-shibboleth.xml
+++ b/swamid-2.0/account.mdh.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/accountcheckout.lnu.se.xml b/swamid-2.0/accountcheckout.lnu.se.xml
index 3c3196d0..51cb6132 100644
--- a/swamid-2.0/accountcheckout.lnu.se.xml
+++ b/swamid-2.0/accountcheckout.lnu.se.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/accounts.bils.se-saml2-metadata.xml b/swamid-2.0/accounts.bils.se-saml2-metadata.xml
index ea5f62b9..6a82ad2a 100644
--- a/swamid-2.0/accounts.bils.se-saml2-metadata.xml
+++ b/swamid-2.0/accounts.bils.se-saml2-metadata.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index bbeac6b1..855eabdf 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </ns0:Extensions>
diff --git a/swamid-2.0/akka-anv.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.uu.se-shibboleth.xml
index ad77f731..be5cff4f 100644
--- a/swamid-2.0/akka-anv.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-anv.uu.se-shibboleth.xml
@@ -15,6 +15,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
index d9b23844..c01783b7 100644
--- a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/aktivera.ki.se-shibboleth.xml b/swamid-2.0/aktivera.ki.se-shibboleth.xml
index 99b28e38..a25b4c06 100644
--- a/swamid-2.0/aktivera.ki.se-shibboleth.xml
+++ b/swamid-2.0/aktivera.ki.se-shibboleth.xml
@@ -16,6 +16,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
index 9210c6a5..2e969227 100644
--- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/alpha.kib.ki.se-shibboleth.xml b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
index 778d36bb..0c66cdb1 100644
--- a/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/alpha.kib.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/amiga.kib.ki.se-shibboleth.xml b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
index e78b7388..e2dd4210 100644
--- a/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/amiga.kib.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 444be912..1d3eb57a 100644
--- a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
index d6a2b49e..9c0cab75 100644
--- a/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/bardo.kib.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
index 9b390527..fdea4d20 100644
--- a/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
+++ b/swamid-2.0/bedomningshandboken.uhr.se-shibboleth.xml
@@ -20,6 +20,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/beta.kib.ki.se-shibboleth.xml b/swamid-2.0/beta.kib.ki.se-shibboleth.xml
index 7eae8315..1a947f3a 100644
--- a/swamid-2.0/beta.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/beta.kib.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/beta.lobber.se-shibboleth.xml b/swamid-2.0/beta.lobber.se-shibboleth.xml
index 6ce5b31b..7ec5a132 100644
--- a/swamid-2.0/beta.lobber.se-shibboleth.xml
+++ b/swamid-2.0/beta.lobber.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
index 198ac5d4..7355ce9f 100644
--- a/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
+++ b/swamid-2.0/bibliometrics.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 58b9df4c..5a710ebf 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 39b5b74a..575dfd20 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index dc82895c..db28bd58 100644
--- a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/confluence.its.umu.se-shibboleth.xml b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
index 4b9b32ae..a3bce995 100644
--- a/swamid-2.0/confluence.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/confluence.its.umu.se-shibboleth.xml
@@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners.
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index d48dc93e..8ad250f9 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
index 476f4b44..c27c3f3d 100644
--- a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/connect-test.sunet.se-shibboleth.xml b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
index 419b83d1..10d4a20e 100644
--- a/swamid-2.0/connect-test.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-test.sunet.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/connect.funet.fi-shibboleth.xml b/swamid-2.0/connect.funet.fi-shibboleth.xml
index 8202195c..a9fa2243 100644
--- a/swamid-2.0/connect.funet.fi-shibboleth.xml
+++ b/swamid-2.0/connect.funet.fi-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index f934124e..b22a4ec5 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/connect.uninett.no-shibboleth.xml b/swamid-2.0/connect.uninett.no-shibboleth.xml
index db8b1dfe..42727275 100644
--- a/swamid-2.0/connect.uninett.no-shibboleth.xml
+++ b/swamid-2.0/connect.uninett.no-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/converis.info-shibboleth.xml b/swamid-2.0/converis.info-shibboleth.xml
index f8ddc1cd..16acbe43 100644
--- a/swamid-2.0/converis.info-shibboleth.xml
+++ b/swamid-2.0/converis.info-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml
index 61aa7284..87d04d3a 100644
--- a/swamid-2.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index 7e8436c6..ecad6448 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/epc.ub.uu.se-shibboleth.xml b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
index 02dbc635..1d4417be 100644
--- a/swamid-2.0/epc.ub.uu.se-shibboleth.xml
+++ b/swamid-2.0/epc.ub.uu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/expert.antagning.se-ecs-sp.xml b/swamid-2.0/expert.antagning.se-ecs-sp.xml
index ca819908..2684248b 100644
--- a/swamid-2.0/expert.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.antagning.se-ecs-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
index d5cfe3a0..2ddf5dec 100644
--- a/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testa.antagning.se-ecs-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
index e085bce8..94dd25a5 100644
--- a/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/expert.testb.antagning.se-ecs-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/gallus.scilifelab.se-shibboleth.xml b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml
index d6d75751..045eaec9 100644
--- a/swamid-2.0/gallus.scilifelab.se-shibboleth.xml
+++ b/swamid-2.0/gallus.scilifelab.se-shibboleth.xml
@@ -16,6 +16,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 123687d6..825943b3 100644
--- a/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/goldings.sae.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 899fbfd5..c2b13ee7 100644
--- a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 327f7250..248c827b 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/jira.its.umu.se-shibboleth.xml b/swamid-2.0/jira.its.umu.se-shibboleth.xml
index 51088150..c27ab8e4 100644
--- a/swamid-2.0/jira.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira.its.umu.se-shibboleth.xml
@@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners.
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/kilw.ki.se-shibboleth.xml b/swamid-2.0/kilw.ki.se-shibboleth.xml
index d976f71a..049d917b 100644
--- a/swamid-2.0/kilw.ki.se-shibboleth.xml
+++ b/swamid-2.0/kilw.ki.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/kitstidp02.tst.ki.se.xml b/swamid-2.0/kitstidp02.tst.ki.se.xml
index 07d27163..cd33feab 100644
--- a/swamid-2.0/kitstidp02.tst.ki.se.xml
+++ b/swamid-2.0/kitstidp02.tst.ki.se.xml
@@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners.
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/kurser.math.su.se-shibboleth.xml b/swamid-2.0/kurser.math.su.se-shibboleth.xml
index 39717c24..2d2cf4de 100644
--- a/swamid-2.0/kurser.math.su.se-shibboleth.xml
+++ b/swamid-2.0/kurser.math.su.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index e60efbb0..09398204 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
index 6687275a..27febdf2 100644
--- a/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-00.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
index d7e79b58..a6dd122a 100644
--- a/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-01.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
index f2318f76..ada06328 100644
--- a/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-02.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
index 72ef7bf0..6985bd5e 100644
--- a/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-03.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
index 6a0e71e3..d254a003 100644
--- a/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-04.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
index bd7415ac..ec57b6c7 100644
--- a/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-demo-05.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
index 8f4e946d..3d0e6769 100644
--- a/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-gui-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/lartorget.sll.se-shibbolet.xml b/swamid-2.0/lartorget.sll.se-shibbolet.xml
index 58d62778..f3191acc 100644
--- a/swamid-2.0/lartorget.sll.se-shibbolet.xml
+++ b/swamid-2.0/lartorget.sll.se-shibbolet.xml
@@ -20,6 +20,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
index 3d9d7b93..93efb096 100644
--- a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
+++ b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
index e4a7170e..5b9174a5 100644
--- a/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
+++ b/swamid-2.0/mailfilter.nordu.net-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/mailfilter.sunet.se-shibboleth.xml b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml
index ff9d9ece..59f3ab0d 100644
--- a/swamid-2.0/mailfilter.sunet.se-shibboleth.xml
+++ b/swamid-2.0/mailfilter.sunet.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/maps.slu.se-shibboleth.xml b/swamid-2.0/maps.slu.se-shibboleth.xml
index d3f5d372..20dbbaa9 100644
--- a/swamid-2.0/maps.slu.se-shibboleth.xml
+++ b/swamid-2.0/maps.slu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 817184b3..f4919fb2 100644
--- a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
index dbbbc42a..2c01394c 100644
--- a/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
+++ b/swamid-2.0/meetingtools.nordu.net-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/meta.eduroam.se-shibboleth.xml b/swamid-2.0/meta.eduroam.se-shibboleth.xml
index c1ad7c52..ef773802 100644
--- a/swamid-2.0/meta.eduroam.se-shibboleth.xml
+++ b/swamid-2.0/meta.eduroam.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index 0d994373..ebe75042 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/mondo.su.se-shibboleth.sso.xml b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
index 7f8174bd..f307fa53 100644
--- a/swamid-2.0/mondo.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/mp.uu.se-shibboleth.sso.xml b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
index 19d95f1b..226e02b5 100644
--- a/swamid-2.0/mp.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-shibboleth.sso.xml
@@ -20,6 +20,7 @@ and do *NOT* provide it in real time to your partners.
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
index eef0e705..fff3c3bf 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/nordunet.tv-shibboleth.xml b/swamid-2.0/nordunet.tv-shibboleth.xml
index 16021d1e..38c09f74 100644
--- a/swamid-2.0/nordunet.tv-shibboleth.xml
+++ b/swamid-2.0/nordunet.tv-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
index 16cbb132..17b0f19b 100644
--- a/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
+++ b/swamid-2.0/nya-00.ladok.umu.se-aws-sp-en.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
diff --git a/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
index bd905ffa..ac7811f7 100644
--- a/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
+++ b/swamid-2.0/nyainloggning.slu.se-shibboleth-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml
index 2c8e572e..56b85e80 100644
--- a/swamid-2.0/pingpong.ki.se-shibboleth.xml
+++ b/swamid-2.0/pingpong.ki.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.hig.se-shibboleth.xml b/swamid-2.0/play.hig.se-shibboleth.xml
index 27ca7f8b..1a5c616b 100644
--- a/swamid-2.0/play.hig.se-shibboleth.xml
+++ b/swamid-2.0/play.hig.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.liu.se-shibboleth.xml b/swamid-2.0/play.liu.se-shibboleth.xml
index e9d5fb58..a51f685d 100644
--- a/swamid-2.0/play.liu.se-shibboleth.xml
+++ b/swamid-2.0/play.liu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.lu.se-shibboleth.xml b/swamid-2.0/play.lu.se-shibboleth.xml
index 4e442228..7c5c58fc 100644
--- a/swamid-2.0/play.lu.se-shibboleth.xml
+++ b/swamid-2.0/play.lu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.mah.se-shibboleth.xml b/swamid-2.0/play.mah.se-shibboleth.xml
index 56f2e63c..dcf262f4 100644
--- a/swamid-2.0/play.mah.se-shibboleth.xml
+++ b/swamid-2.0/play.mah.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.mdh.se-shibboleth.xml b/swamid-2.0/play.mdh.se-shibboleth.xml
index 9028fbe8..68f5cab6 100644
--- a/swamid-2.0/play.mdh.se-shibboleth.xml
+++ b/swamid-2.0/play.mdh.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/play.sunet.se-shibboleth.xml b/swamid-2.0/play.sunet.se-shibboleth.xml
index e8e303fd..31988292 100644
--- a/swamid-2.0/play.sunet.se-shibboleth.xml
+++ b/swamid-2.0/play.sunet.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 091c33e8..a69f0303 100644
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/problem.math.su.se-shibboleth.xml b/swamid-2.0/problem.math.su.se-shibboleth.xml
index eedade4b..71f04c34 100644
--- a/swamid-2.0/problem.math.su.se-shibboleth.xml
+++ b/swamid-2.0/problem.math.su.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/registrera.hb.se-shibboleth.xml b/swamid-2.0/registrera.hb.se-shibboleth.xml
index 8e093258..74973c2b 100644
--- a/swamid-2.0/registrera.hb.se-shibboleth.xml
+++ b/swamid-2.0/registrera.hb.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
index 23558a64..218fa931 100644
--- a/swamid-2.0/rems.csc.fi.xml
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
index 541e1fcd..53e62418 100644
--- a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
index 48871a7d..168ccf9b 100644
--- a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
index 80bfa895..5cc5323f 100644
--- a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
index b6fc23ce..fb34ddc5 100644
--- a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
       </ns2:Attribute>
diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index f4a88b29..45171085 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/sdauth.sciencedirect.com.xml b/swamid-2.0/sdauth.sciencedirect.com.xml
index 9f89882d..c3cd3fab 100644
--- a/swamid-2.0/sdauth.sciencedirect.com.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>
diff --git a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
index 7b9ff508..4aae26b8 100644
--- a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/se.timeedit.net-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index 9f387594..e549c98e 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
index 7d93e856..ab12bb2f 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
index e89ef6ed..089b5568 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/shibboleth.ebscohost.com.xml b/swamid-2.0/shibboleth.ebscohost.com.xml
index b0a85eed..df80007f 100644
--- a/swamid-2.0/shibboleth.ebscohost.com.xml
+++ b/swamid-2.0/shibboleth.ebscohost.com.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
index 38ae9b4f..b3069204 100644
--- a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
+++ b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/shibdev.rsc.org-shibboleth.xml b/swamid-2.0/shibdev.rsc.org-shibboleth.xml
index 8f19deda..e529dcc9 100644
--- a/swamid-2.0/shibdev.rsc.org-shibboleth.xml
+++ b/swamid-2.0/shibdev.rsc.org-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/sp-test.swamid.se-shibboleth.xml b/swamid-2.0/sp-test.swamid.se-shibboleth.xml
index 120eb1ca..067fdb2b 100644
--- a/swamid-2.0/sp-test.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp-test.swamid.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/sp.it.gu.se-shibboleth.xml b/swamid-2.0/sp.it.gu.se-shibboleth.xml
index 09637b34..0f850c89 100644
--- a/swamid-2.0/sp.it.gu.se-shibboleth.xml
+++ b/swamid-2.0/sp.it.gu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml
index 6a5be909..aa283726 100644
--- a/swamid-2.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp.swamid.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
index ea080dd6..7d186258 100644
--- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
@@ -4,6 +4,7 @@
     <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
       <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
     </samla:Attribute>
   </md:Extensions>
   <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 0f786a7a..332cc89e 100644
--- a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 98a65222..edbaf8b9 100644
--- a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 32e5b1b0..45be03fd 100644
--- a/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index a29adacf..e6cdb7e7 100644
--- a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -6,6 +6,7 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
index 0145cd7a..2796e04f 100644
--- a/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/test.mp.uu.se-shibboleth-sso.xml
@@ -15,6 +15,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
index 07028847..35c7b9ad 100644
--- a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
+++ b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
@@ -16,6 +16,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/ugit.se-sp.xml b/swamid-2.0/ugit.se-sp.xml
index 4146e2f6..e191773b 100644
--- a/swamid-2.0/ugit.se-sp.xml
+++ b/swamid-2.0/ugit.se-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/uraccess.se-shibboleth-sp.xml b/swamid-2.0/uraccess.se-shibboleth-sp.xml
index c505c461..15f4eb14 100644
--- a/swamid-2.0/uraccess.se-shibboleth-sp.xml
+++ b/swamid-2.0/uraccess.se-shibboleth-sp.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/urn-urkund-shibboleth-sp.xml b/swamid-2.0/urn-urkund-shibboleth-sp.xml
index 466fd2b3..9db7884b 100644
--- a/swamid-2.0/urn-urkund-shibboleth-sp.xml
+++ b/swamid-2.0/urn-urkund-shibboleth-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index a5e63a07..cf911aa1 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
index 0f4b53bd..b9d1e1b3 100644
--- a/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-stage.ladok3.its.umu.se-gui-sp.xml
@@ -19,6 +19,7 @@ and do *NOT* provide it in real time to your partners.
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
index c586dc55..c14c7fa1 100644
--- a/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
+++ b/swamid-2.0/www-utb.ladok3.its.umu.se-gui-sp.xml
@@ -15,6 +15,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
index bc406b7b..5be19988 100644
--- a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
+++ b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
       </samla:Attribute>
diff --git a/swamid-2.0/www.antagning.se-aws-sp.xml b/swamid-2.0/www.antagning.se-aws-sp.xml
index aea35d7a..ca6fa199 100644
--- a/swamid-2.0/www.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.antagning.se-aws-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.antagning.se-ecs-sp.xml b/swamid-2.0/www.antagning.se-ecs-sp.xml
index 79886fde..1b86701f 100644
--- a/swamid-2.0/www.antagning.se-ecs-sp.xml
+++ b/swamid-2.0/www.antagning.se-ecs-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/www.diva-portal.org-shibboleth.xml b/swamid-2.0/www.diva-portal.org-shibboleth.xml
index 581a1cd1..649e1f58 100644
--- a/swamid-2.0/www.diva-portal.org-shibboleth.xml
+++ b/swamid-2.0/www.diva-portal.org-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/www.ifmsa.se-sp.xml b/swamid-2.0/www.ifmsa.se-sp.xml
index 0c010a42..c5e135f7 100644
--- a/swamid-2.0/www.ifmsa.se-sp.xml
+++ b/swamid-2.0/www.ifmsa.se-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
index 47af38e8..1d6551db 100644
--- a/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-ik.ladok.se-gui-sp.xml
@@ -15,6 +15,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index 5d051e60..aa81cb2c 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
@@ -15,6 +15,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.play.umu.se-shibboleth.xml b/swamid-2.0/www.play.umu.se-shibboleth.xml
index 7f178bc0..c05044d6 100644
--- a/swamid-2.0/www.play.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.play.umu.se-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/www.testa.antagning.se-aws-sp.xml b/swamid-2.0/www.testa.antagning.se-aws-sp.xml
index a3dbd377..1d6d1338 100644
--- a/swamid-2.0/www.testa.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.testa.antagning.se-aws-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
index 23ada522..c46a1559 100644
--- a/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.testa.universityadmissions.se-aws-sp-en.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.testb.antagning.se-aws-sp.xml b/swamid-2.0/www.testb.antagning.se-aws-sp.xml
index a96310f9..e25488e6 100644
--- a/swamid-2.0/www.testb.antagning.se-aws-sp.xml
+++ b/swamid-2.0/www.testb.antagning.se-aws-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
diff --git a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
index 8f15a786..c6ff84c3 100644
--- a/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.testb.universityadmissions.se-aws-sp-en.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://www.swamid.se/assurance-requirement">
diff --git a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
index 6f23e667..fba8946a 100644
--- a/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
+++ b/swamid-2.0/www.universityadmissions.se-aws-sp-en.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
index 426edcd7..8d742fee 100644
--- a/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/www.wisum.its.umu.se-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
index d8f5e1fe..31cc7354 100644
--- a/swamid-2.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>
diff --git a/swamid-2.0/www4.genuinetext.com-shibboleth.xml b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
index 8f6d8288..facfeb41 100644
--- a/swamid-2.0/www4.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www4.genuinetext.com-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml
index e65e8d46..14855723 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
   </ns0:Extensions>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml
index 62bb7329..bca61fb9 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_eu-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml
index 102552e2..a1839e19 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_hei-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
index 2e95fe13..31820cd1 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_nren-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml
index 480693f1..26c4e7ce 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8086-re_sfs_hei-sp.xml
@@ -4,6 +4,7 @@
     <ns1:EntityAttributes xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute">
       <ns2:Attribute xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category">
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
         <ns2:AttributeValue xmlns:ns3="http://www.w3.org/2001/XMLSchema-instance" ns3:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
       </ns2:Attribute>
diff --git a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
index e295f8ee..ff7d58af 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
index 952b04bc..2fd0b98b 100644
--- a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
+++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
@@ -5,6 +5,7 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>