Synch with later SAML 2.0 spec