Added delimitMate and supertab