OPAL-2320: Refactoring