Few changes to parser