Updated core files to work with Guzzle update