Added support for images and albums