Updated album data structure