Use ENV.fetch where necessary