Handle overriding of params correctly