Updated canonical data dictionary and CHAP mapping