Added Guzzle by default and better environment detection