Fix guzzle service definitions

Also adds support for attribute primitive types