updating after core's refactoring changes