Parser modification