#MLHR-678 Refactoring.