INT-3380: Refactoring