Refactored NHibernate classes
Refactored