Work on NHibernate (Not yet breaking as not in use)