Issue #126

- Updated `MappingServices` to use underlying types for collections
- Created MappingServices feature to verify functionality