Added property evaluation support