modified database structure