Adding more command parsing.