2.x update

Yes + modify ChangeNotification<Server> does not make sense. The meaning would be that the IP or port of a service may dynamically change at any time. If there is such use case, we first need to implement deltas for Server objects.