Refactored imt-mates-transform