Updates to remove dependency on internet connection