OZP-806 Refactored translation logic