Updated the database structure