While you're in here, what do you think about changing 'Supported' to something else? Differentiating custom parameters from upstream parameters with 'Custom' vs 'Supported' doesn't really come across clearly.