moved database types to their own file
Changes to the data collected