Added media download support