add support for optional command tokens, e.g. mono