Upgraded schema definitions