Changed matrix data return structure