Fix image and add data