updated to handle remote schemata
updates