Updated load-env and documentation