Fix up map to be scalable