Added WAYF and Simple SAML support