Add other data classes