Changing how parsing works and adding new commands