Better property detection