added more data classes