database structure adapted