Add auto download support