Adapt to new schema reference scheme.