Add override to skip CommandT