Refactored WrappedClient and MappingUtils.

Signed-off-by: Froilan <froilan.co@orangeandbronze.com>