Updated Database Design