Get rid of Network-provider, Differenciate indoor/outdoor