#commit-5 : updating parsers implementation