Added last minute mappings for HMT