Doc changes for the environment support