Map: Drawing refactoring.