Added content datastream and removed crud