Rework op overrides