Simplifying the wrapper map
Merge branch 'development'