more changes to database structure