Added network packge.
Fixed network metrics.
Merge branch 'test' into dev