Rebuild map structure