Add support for attributes with images in.