DAT-2182 Return image paths too