New table classes, renamed classes