added TapCommand support