Added support for buffer export