Added autocomplete for working name