Added shuffling and cross validation generation to the Matrix container.