Update to schema with 'supplemental' collection in mind