Performance optimizations

Updated NHibernate version