Added functionality to the parser