Improved completion config