More NH stuff (not working yet, but no breaking changes to EF usage)