Add Cross-reference Streams support