Property Grid Upgrades