refactored mapping
Merge branch 'new-mapping'