Changed command parsing