Next round of api improvements.