edited database structure