WIP improvement of mapping Logic