Changed expressions to use properties.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev