added tokens to commands conversion