Added additional controls for creating variety of SAML tokens