DEP-63 ITSOffline refactorisation