Added support for entity name autocompletion