Make NetworkService internal and fix
working on the backlog page