Added database structure