Added artist/album functionality