Added support for buffer area.