Extended_hosts is now a map