Upgrade for naming service support