Enhancement to service mapping