Add buffered data classes

Check it and the concept in background
You are right. Update it.