Added shuffling support