Addressing map comments