More tuning of the table classes, now can be more easily extended