added ContentFile and ImageFile