Added functionality for static network