[update:] core refactoring