Edited HibernateDataService