Re-adds SchemaState interface refactoring
Bringing over a little cypher goodie that was missing
Re-adds ROContext support