Re-parse mappings from a reader quickly added. Integration still missing.