Add command tokens to command handlers