Add shuffle generator