Reworking datastream id spec to be order agnostic

Closes #89