Added support for Shuffle and Repeat