Added enableBuffer()