Introducing new parser, code clean-ups etc.
Parser changes