Map is not longer using Image class