Checking in Rajesh's work on Hibernate refactoring.