add attribute information
Merge branch 'saml_update'