Implemented native highlighting