Adding shuffle mode support