added functionality for hqmfr2 generation and parsing to use new oid map