added new database structure