Added autocompletion and rename