Added updated db schema