OPAL-2019: Extracted inner-classes for callbacks