Updated with service's self registration