This is public API, so it would be better to add the new arg at the end for backwards compatibility.