Upgraded schema0.cs