More metadata work