Improve mappings
Merge branch 'improve-mappings'