updated database structure and data