Added support for sets/playlists