added buffer for each single entity