OPAL-2510: Simplifying callbacks