internal changes for autocompletion
updated info