Initial changes for networking