HibernateOgmDao refactoring