Added property templates