modernized ImageRepository