Updated db creation