Upgraded db schema