Updated schemata