Revisit buffer implementations