Modify API for table following Diego's more explicit suggestion