Added experimental auto-completion
Fixed name