added checking for class autocompletion