Updated Database Schema