Fixing new metadata output