#4137 Start breaking out metadata