Add the ability to define the network type for Issue #539