Changed handling of network mappings.