Added command handling