Added many improvements to Network API
Removed env() function
Using new Network API