ImageRepository modernize