Add Tzvook's changes (i.e. the image field for custom fields)