Feature/generic network resource

This pull requests should start at commit 745e829

Please, enter #821 before this one.