#386 Updated db schema