Added Online/Offline/Update Handling