Updated HMT mappings