Add a separate class for networking related storage