Added manual mappings for HMT