Datastream and model cleanup
Additional changes
DOI identifier fix