More metadata work.