Add separation of generated storage network mapping by roles. Code refactoring.