Refactoring for DL-Learner V2.