Updated auto complete