Improve property completion support