Updated Download CLI to ensure right vars are always present and validated