Add support for network options