Added albumart support