Cores refactoring