Improved SchemaGraph handling