Add buffered data classes

Check it and the concept in background
I will do it