Updated files to reflect changes in database structure
Updated files to reflect changes in database structure