OZP-12: refactor