Make completion more powerful