Update for better playlist creation