Continued implementation of new map management