KIJIMR-58. Rework job builders.