Added support for playlists