added Offline functionalities