Improve property parser