Checking in for Rajesh: Hibernate refactoring.