Some more buffering data source work