Updated Database Structure