Updated canonical data dictionary and SHHS mapping