Reimplement original map-image system