Aligned to new properties demarcation standard.