Added tokenisation of input