Updated SHHS mapping