Re: Next round of api improvements.