[*] Core : some refactoring