[IMP] Refactorisation