Prepare for new databases
WIP NestedRecord