Upgrading auto-complete