Improved image service per #1237