Improve some buffer's feature