Add support for multiple albums