Improve completion API.