Changed dataMatrix setup