Added tabular to contain data classes