Added offline capability