VP-297: Updates to work with schema version of UIO, and to get tests passing. Not all tests passing yet.