Scott Marlow Can you give this a try when you get a chance? I think the general approach is fine; I might need to tweak this some to accommodate some integration work we did between ORM and OGM this go-round, but that should not effect the fix really.

Gunnar Morling Take a look at this when you get a chance and make sure it fits with OGM.