add the rest of data classes