Refactoring into just service-advertisement.