Updates to experimental-parser