Improved OverrideHandler initialization.