More work on SAML code