Move user overrides into a module in core