Finished removing data classes, use packed tables directly