CON-1303: Better support for images