Updated Image management