Moved some methods from Network class to proper classes