Adding support for albums