Tolls updated with current data sources