new database structure according to new design