CLC-4230 - Partial refactor