Changes to NHibernate/Activerecord storage code