Added playlist mode