Adding more metadata mangling