Database Schema : Updated