Included some late HMT mappings