UPDATED: working on Hibernate NR