Added in data handling for image