Added album support