Added table selection mode