Added data classes to allow retrieval of data in a polymorphic fashion