RAVEN - refactor manager to work with hibernate