Adding support for inclusive tokens, this time really