New Db structure fixes - WIP