DB layer upgrades