Move the overrides into a single object