Initial support for buffer