Updated Database structure