Code basis reorganized a bit
Mapping tables externalized
Correction to metadata mapping