API tweaking.