#141 improved propery and class autocompletion