Drastic simplification of Image entity and image upload process