Rework handling of user-defined operations