Improved sample-petstore definitions