BaseNetwork improvement