Work on new database structure