Split implementation of previous buffer into two buffers classe.