More parsing changes