DEP-61 further refactorisation