Added property evaluation. And some @ for special entities...