Adds mapping
Updates Manager to use Mapping
Merge branch 'feature/mapping' into develop