Added buffer options