Add artist/song bookmark support