Enhance naming service support