Use new network modules semantics (closes #283)