Add a couple of tokeniser classes