Use array object instead of flat arrays
Improved highlighting