Incremental enhancement to Encounter parser