Recreate BlockHighlightHandler in core package