Add shuffling of data after each epoch