Added matrix data, highlighter data