Added buffer support