Improve completion behavior