Updated to new version of Datastream API and fixed some issues.