Added tab remapping