Use property attributes when present
Fix property attributes