Adding env var reading