3.0 : Core refactoring