Playlist refactoring