Added in more SAML Control