Added functions to parser