Refactoring due to changes in DL-Learner.