added fields to stream and model