CLC-4230 - Refactor