Added new data classes.