Updated Table methods