Added offline download support