Map as per new rules