Updated SHHS mappings