I would be a bit more conservative, checking if commsServices contains any of the two keys first.

If we uplift this to v1.0.1 we will need to remove some of  the mappingParameters, if we forget, we still can be safe.