Added offline capabilities