updated database structure and sample entries