PIM-3323: Refactoring