Update: Reorganized conversionMapBuilder architecture