Better property parsing