Updated core files to work with guzzle update