Add mapping to UTs