Added local network support