Improve album generator.