More accurately identify commands