New samples for editable data, plus other content changes