Added property substitution and tests.