Commit for parser

Additional changes for second stage - parser