Removed NHibernate dependency