Updated Table Mode Plugin