OPAL-2427: Simplifying callbacks