Further implementation work for NHibernate