Updated setup-env script