Improved property map instancing