Make work better with buffer-tools