Improved update handling and added image service.