Add album support