More datastream settings work