Feature/mapping for everyone

Bug fix: [no]
Feature addition: [yes]
Backwards compatibility break: [yes]
Unit test passes: [yes]
Phpspec specification passes: [yes]
Checkstyle issues: [no]
ChangeLog updated: [yes]