Adding buffer implementation.