Changing base_url_choice to a map
Adding JsonNodes to tcp and tp