redesign of mapping framework