Updated db schema