Minor changes in Generic Network