Added ESAPI + exception mappers + Session entity