Moved environment to envvar