Added new data classes