Reimplement automatic map updating