Updated for NHibernate 3.3.3