Move env handling to strategies