adding more autocompletion magic