Update for recent parse changes