Parser.cpp - Dmitry updated functions to match other functions