Updated command parsing