Add potential CommandT replacement