Painting map is refactored too