Fix composer
Add tokeniser