Added command parsing for inputs