MapGateway refactor, #63