Building out some of the data classes