Refactored mapping
Merge branch 'develop' of github.com:confa/Azimuth into develop