Implemented some more data classes