Added Connectivity Check and Preferences