REN-132 Implemented new parser base