Added more command recognition