Added support for public networks