Adding network elements
Minor changes