Add better command completion