Table class updated