Add env to options instead of passed in