more metadata consolidation