separated unmarshalling section
Implemented listener body to change the messages
Added "saml settings" observer ability