Implement more general highlighting