REfactor
No more public fields on TabularData (was temporary)