Added local auto-complete