anchor.diff:      ?debug("    data_link_bert_rpc_rpc:service_announce(): Signature:      ~p", [ Signature ]),
       ?debug("    data_link_bert_rpc_rpc:service_announce(): Services:       ~p", [ Services ]),
   
  -    %% Register the received services.
  +    %% Register the received services with all relevant components
       RemoteNetworkAddress = RemoteAddress  ++ ":" ++ integer_to_list(RemotePort),
  -    register_announced_services(RemoteNetworkAddress, Services),
  -
  -    %% Report that the data link is up
  -
  -    rvi_common:send_component_request(service_discovery, data_link_up, 
  -					  [
  -					   {services, Services}, 
  -					   { network_address,	RemoteNetworkAddress }
  -					  ]),
  -
  -    rvi_common:send_component_request(schedule, data_link_up, 
  -					  [
  -					   {services, Services}, 
  -					   { network_address,	RemoteNetworkAddress }
  -					  ]),
  -
  -    rvi_common:send_component_request(service_edge, data_link_up, 
  -    					  [
  -     					   {services, Services}, 
  -     					   { network_address,	RemoteNetworkAddress }
  -     					  ]),
  +    rvi_common:send_component_request(service_discovery, register_remote_services, 
  +				      [
  +				       {services, Services}, 
  +				       {network_address, RemoteNetworkAddress}
  +				      ]),
  +
  +
       ok.
  -
  -
  -register_announced_services(_NetworkAddress, []) ->
  -    ok;
  -
  -register_announced_services(NetworkAddress, [ Service | T ]) ->
  -    ?debug("    data_link_bert_rpc_rpc:register_announced_services():Registering service: ~p | addr: ~p",
  -	   [Service, NetworkAddress]),
  -    case 
  -	rvi_common:send_component_request(service_discovery, register_remote_service, 
  -					  [
  -					   {service, Service}, 
  -					   {network_address, NetworkAddress}
  -					  ]) of
  -	{ ok, _, _JSON} -> 
  -	    register_announced_services(NetworkAddress, T);
  -
  -	Err -> 
  -	    ?debug("    data_link_bert_rpc_rpc:register_announced_services(): Failed at data_link_up: ~p", 
  -		      [ Err ]),
  -	    Err
  -    end.
  -
   
   
   receive_data(Data) ->
  
positive.code: 			     {certificate, {}}, { signature, {}} ]),
      ok.
  
      
  authorize(TransactionID, RemoteAddress, RemotePort, Protocol, Certificate, Signature) ->
      ?debug("    data_link_bert_rpc_rpc:authorize(): TransactionID:  ~p", [ TransactionID ]),
  
negative.code: 	    {error, { missing_env, bert_rpc_server}}
      end.
  
  %%
  %% Since we, in this demo code, haven't done pure P2P service discovery yet,
  %% we will simply connect to all configured static nodes.
  %%
  setup_static_node_data_links() ->
      setup_static_node_data_links(rvi_common:static_nodes()).
  
  setup_static_node_data_links([ ]) ->
      ok;
  
  setup_static_node_data_links([ { _Prefix, NetworkAddress} | T]) ->
      [ Address, Port] =  string:tokens(NetworkAddress, ":"),
      setup_data_link(Address, list_to_integer(Port), undefined),
      setup_static_node_data_links(T).
  
  setup_data_link(RemoteAddress, RemotePort, Service) ->
      { LocalAddress, LocalPort} = rvi_common:node_address_tuple(),
  