Modifications to auto complete config