Change to environment variable usage