Upgrade to the PropertyPlaceholder