Added downloads support