Changes to include recent parser and updating asserts