New, cleaner mapping format