Fully implemented new mapping strategy and removed old one. For #37