[MOD] Core: various refactorings