Updated 2.0 schema with upstream changes