Added support for hidden tokens, and token channels