Improve property evaluation