Fix map structure

Pull this