Further revision of nHibernate DB calls