Updated for root_url changes