Modifications to parser