Changed metadata reading again.