Adapted some feature to match documentation in Environment.