Adds Command parsing