Image management improved