Updated auto complete methods