Improve completion