Started adding in datastream client.