Update for auto-complete