Modified database structure