Improved PropertyProvider hierarchy.