Improve how the local map is maintained