Added image_url support