Move from auto-complete to company