Working parser code changes