Add support for add/removing zones, and retrieving tokens