Adding scheme env var support