Parse connections properly
Removed network from main entity
Some refactor