Added albums functionality