IMG-756: Refactoring.