Add env and host variables