Preparing for Album support