Added a couple of fields from the database to further complete the set of data we're collecting