I.1.0.0: refactorization