Added buffer management wrapper.