Added Mapping resolver classes
Added unittests for the resolver