Added support for multiple albums