(WCM-448) Added shuffle attribute