RAVEN - refactor user to work with hibernate