Changes to use new Guzzle 5 and updated services