add data classes, not working yet