make it work with some more schemata