updated mapping service

Change-Id: I6c657f62e2260f45f8ce17ff6a3be4d119574f6c
Signed-off-by: David Goldberg <david.goldberg@contextream.com>