Continued refactoring map feature name and color retrieval