Better property donor detection