In my opinion, this is not your problem to solve. At least not within the scope of this PR. It's our mess and we should deal with it. Though if you want to help, we're thankful! :smile::+1: I do have a comment though; why do you declare a new `_overrides` dictionary in `RuntimeServices` when we're already passing it to the base class (`ScriptServicesRegistration`)? Could we change the one in the base class to `protected` instead? Other than that, it looks good to me. Great job! :grin: