Improve how overriding of params is done

Explanation is written in the very long commit message.