Changing matrix generation to fit with data objects.