Changed metadata handling again.