Enabled the new-style controller overrides