Adding initial buffer implementation.