Updated Database Model