diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
index 1deca998a0d..d2b43120854 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
@@ -49,8 +49,6 @@ impl<T> From<serde_json::Error> for Error<T> {
     }
 }
 
-use super::models::*;
-
 mod request;
 
 {{#apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
index a0648b758bc..2aa7338b4b7 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
@@ -3,8 +3,7 @@ use std::rc::Rc;
 use hyper;
 use super::configuration::Configuration;
 
-pub struct APIClient<C: hyper::client::Connect> {
-    configuration: Rc<Configuration<C>>,
+pub struct APIClient {
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
@@ -18,12 +17,11 @@ pub struct APIClient<C: hyper::client::Connect> {
 {{/apiInfo}}
 }
 
-impl<C: hyper::client::Connect> APIClient<C> {
-    pub fn new(configuration: Configuration<C>) -> APIClient<C> {
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
index 449cc61c5de..adb51d6e92c 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
@@ -1,6 +1,5 @@
 {{>partial_header}}
 use hyper;
-use std::collections::HashMap;
 
 pub struct Configuration<C: hyper::client::Connect> {
     pub base_path: String,
diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
index 37a3ff77bcc..f371e0e703c 100644
--- a/modules/openapi-generator/src/main/resources/rust/model.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -20,14 +20,14 @@ pub enum {{classname}} {
 
 {{!-- for non-enum schemas --}}
 {{^isEnum}}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct {{{classname}}} {
 {{#vars}}
     {{#description}}
     /// {{{description}}}
     {{/description}}
     #[serde(rename = "{{{baseName}}}"{{^required}}, skip_serializing_if = "Option::is_none"{{/required}})]
-    pub {{{name}}}: {{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{^required}}Option<{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{^required}}>{{/required}},
+    pub {{{name}}}: {{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{^required}}Option<{{/required}}{{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{^required}}>{{/required}},
 {{/vars}}
 }
 
@@ -35,7 +35,7 @@ impl {{{classname}}} {
     {{#description}}
     /// {{{description}}}
     {{/description}}
-    pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{{dataType}}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} {
+    pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} {
         {{{classname}}} {
             {{#vars}}
             {{{name}}}: {{#required}}{{{name}}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}None{{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}},
@@ -49,7 +49,7 @@ impl {{{classname}}} {
 {{#vars}}
 {{#isEnum}}
 /// {{{description}}}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum {{enumName}} {
 {{#allowableValues}}
 {{#enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/rust/request.rs b/modules/openapi-generator/src/main/resources/rust/request.rs
index 383a409542b..2d5c7eb5a64 100644
--- a/modules/openapi-generator/src/main/resources/rust/request.rs
+++ b/modules/openapi-generator/src/main/resources/rust/request.rs
@@ -24,6 +24,7 @@ impl ApiKey {
     }
 }
 
+#[allow(dead_code)]
 pub(crate) enum Auth {
     None,
     ApiKey(ApiKey),
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
index 038284ec6c3..35d25dfde7b 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -4,7 +4,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct {{{classname}}}Client {
     configuration: Rc<configuration::Configuration>,
@@ -33,7 +33,7 @@ impl {{{classname}}} for {{{classname}}}Client {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}urlencode({{/isString}}{{{paramName}}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
+        let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
         let mut req_builder = client.{{{httpMethod}}}(uri_str.as_str());
 
         {{#queryParams}}
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
index 318b0f7a0db..93123e31fac 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
@@ -30,8 +30,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-use super::models::*;
-
 {{#apiInfo}}
 {{#apis}}
 mod {{{classFilename}}};
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
index 5fdede09c4f..9eab1328656 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    configuration: Rc<Configuration>,
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
@@ -22,7 +21,6 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
diff --git a/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig
new file mode 100644
index 00000000000..479c313e87b
--- /dev/null
+++ b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig
@@ -0,0 +1 @@
+4.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust-reqwest/src/apis/client.rs b/samples/client/petstore/rust-reqwest/src/apis/client.rs
index 14088cbe309..f2319088324 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/client.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/client.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    configuration: Rc<Configuration>,
     pet_api: Box<crate::apis::PetApi>,
     store_api: Box<crate::apis::StoreApi>,
     user_api: Box<crate::apis::UserApi>,
@@ -14,7 +13,6 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
             pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
             store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
             user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
diff --git a/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig b/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig
new file mode 100644
index 00000000000..f2319088324
--- /dev/null
+++ b/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig
@@ -0,0 +1,34 @@
+use std::rc::Rc;
+
+use super::configuration::Configuration;
+
+pub struct APIClient {
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
+}
+
+impl APIClient {
+    pub fn new(configuration: Configuration) -> APIClient {
+        let rc = Rc::new(configuration);
+
+        APIClient {
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
+        }
+    }
+
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
+        self.pet_api.as_ref()
+    }
+
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
+        self.store_api.as_ref()
+    }
+
+    pub fn user_api(&self) -> &crate::apis::UserApi{
+        self.user_api.as_ref()
+    }
+
+}
diff --git a/samples/client/petstore/rust-reqwest/src/apis/mod.rs b/samples/client/petstore/rust-reqwest/src/apis/mod.rs
index 8ca9138588c..c14d751153a 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/mod.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/mod.rs
@@ -30,8 +30,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-use super::models::*;
-
 mod pet_api;
 pub use self::pet_api::{ PetApi, PetApiClient };
 mod store_api;
diff --git a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
index 264fc30e685..428e75bbea6 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct PetApiClient {
     configuration: Rc<configuration::Configuration>,
diff --git a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
index dac744b3b21..16b4176562c 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct StoreApiClient {
     configuration: Rc<configuration::Configuration>,
@@ -39,7 +39,7 @@ impl StoreApi for StoreApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=urlencode(order_id));
+        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
         let mut req_builder = client.delete(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
diff --git a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
index e2321b3daa4..3c82ab1502a 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct UserApiClient {
     configuration: Rc<configuration::Configuration>,
@@ -100,7 +100,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.delete(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
@@ -118,7 +118,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.get(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
@@ -172,7 +172,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.put(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
diff --git a/samples/client/petstore/rust-reqwest/src/models/api_response.rs b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
index 814483602dd..d83716a9a1b 100644
--- a/samples/client/petstore/rust-reqwest/src/models/api_response.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
@@ -11,7 +11,7 @@
 /// ApiResponse : Describes the result of uploading an image resource
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ApiResponse {
     #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
     pub code: Option<i32>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/category.rs b/samples/client/petstore/rust-reqwest/src/models/category.rs
index 8cb5797ee1c..4b2c812339b 100644
--- a/samples/client/petstore/rust-reqwest/src/models/category.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/category.rs
@@ -11,7 +11,7 @@
 /// Category : A category for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Category {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/order.rs b/samples/client/petstore/rust-reqwest/src/models/order.rs
index 24ad342497a..637dd71cde5 100644
--- a/samples/client/petstore/rust-reqwest/src/models/order.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/order.rs
@@ -11,7 +11,7 @@
 /// Order : An order for a pets from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Order {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -23,7 +23,7 @@ pub struct Order {
     pub ship_date: Option<String>,
     /// Order Status
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
     #[serde(rename = "complete", skip_serializing_if = "Option::is_none")]
     pub complete: Option<bool>,
 }
@@ -43,7 +43,7 @@ impl Order {
 }
 
 /// Order Status
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "placed")]
     Placed,
diff --git a/samples/client/petstore/rust-reqwest/src/models/pet.rs b/samples/client/petstore/rust-reqwest/src/models/pet.rs
index e3c61239cdc..efc6f370ff5 100644
--- a/samples/client/petstore/rust-reqwest/src/models/pet.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/pet.rs
@@ -11,7 +11,7 @@
 /// Pet : A pet for sale in the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -25,7 +25,7 @@ pub struct Pet {
     pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
 }
 
 impl Pet {
@@ -43,7 +43,7 @@ impl Pet {
 }
 
 /// pet status in the store
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "available")]
     Available,
diff --git a/samples/client/petstore/rust-reqwest/src/models/tag.rs b/samples/client/petstore/rust-reqwest/src/models/tag.rs
index c7cbdf2cc05..69e361463e3 100644
--- a/samples/client/petstore/rust-reqwest/src/models/tag.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/tag.rs
@@ -11,7 +11,7 @@
 /// Tag : A tag for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Tag {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/user.rs b/samples/client/petstore/rust-reqwest/src/models/user.rs
index e54ed701306..e204a5e325c 100644
--- a/samples/client/petstore/rust-reqwest/src/models/user.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/user.rs
@@ -11,7 +11,7 @@
 /// User : A User who is purchasing from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/.openapi-generator/VERSION.orig b/samples/client/petstore/rust/.openapi-generator/VERSION.orig
new file mode 100644
index 00000000000..479c313e87b
--- /dev/null
+++ b/samples/client/petstore/rust/.openapi-generator/VERSION.orig
@@ -0,0 +1 @@
+4.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust/src/apis/client.rs b/samples/client/petstore/rust/src/apis/client.rs
index dd0de97eb53..39175e119e0 100644
--- a/samples/client/petstore/rust/src/apis/client.rs
+++ b/samples/client/petstore/rust/src/apis/client.rs
@@ -3,19 +3,17 @@ use std::rc::Rc;
 use hyper;
 use super::configuration::Configuration;
 
-pub struct APIClient<C: hyper::client::Connect> {
-    configuration: Rc<Configuration<C>>,
+pub struct APIClient {
     pet_api: Box<crate::apis::PetApi>,
     store_api: Box<crate::apis::StoreApi>,
     user_api: Box<crate::apis::UserApi>,
 }
 
-impl<C: hyper::client::Connect> APIClient<C> {
-    pub fn new(configuration: Configuration<C>) -> APIClient<C> {
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
             pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
             store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
             user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
diff --git a/samples/client/petstore/rust/src/apis/client.rs.orig b/samples/client/petstore/rust/src/apis/client.rs.orig
new file mode 100644
index 00000000000..39175e119e0
--- /dev/null
+++ b/samples/client/petstore/rust/src/apis/client.rs.orig
@@ -0,0 +1,35 @@
+use std::rc::Rc;
+
+use hyper;
+use super::configuration::Configuration;
+
+pub struct APIClient {
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
+}
+
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
+        let rc = Rc::new(configuration);
+
+        APIClient {
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
+        }
+    }
+
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
+        self.pet_api.as_ref()
+    }
+
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
+        self.store_api.as_ref()
+    }
+
+    pub fn user_api(&self) -> &crate::apis::UserApi{
+        self.user_api.as_ref()
+    }
+
+}
diff --git a/samples/client/petstore/rust/src/apis/configuration.rs b/samples/client/petstore/rust/src/apis/configuration.rs
index c282a0c30df..83d5f1c3d0c 100644
--- a/samples/client/petstore/rust/src/apis/configuration.rs
+++ b/samples/client/petstore/rust/src/apis/configuration.rs
@@ -9,7 +9,6 @@
  */
 
 use hyper;
-use std::collections::HashMap;
 
 pub struct Configuration<C: hyper::client::Connect> {
     pub base_path: String,
diff --git a/samples/client/petstore/rust/src/apis/mod.rs b/samples/client/petstore/rust/src/apis/mod.rs
index 06935c28a93..8e1f9cc2adb 100644
--- a/samples/client/petstore/rust/src/apis/mod.rs
+++ b/samples/client/petstore/rust/src/apis/mod.rs
@@ -49,8 +49,6 @@ impl<T> From<serde_json::Error> for Error<T> {
     }
 }
 
-use super::models::*;
-
 mod request;
 
 mod pet_api;
diff --git a/samples/client/petstore/rust/src/apis/request.rs b/samples/client/petstore/rust/src/apis/request.rs
index 383a409542b..2d5c7eb5a64 100644
--- a/samples/client/petstore/rust/src/apis/request.rs
+++ b/samples/client/petstore/rust/src/apis/request.rs
@@ -24,6 +24,7 @@ impl ApiKey {
     }
 }
 
+#[allow(dead_code)]
 pub(crate) enum Auth {
     None,
     ApiKey(ApiKey),
diff --git a/samples/client/petstore/rust/src/models/api_response.rs b/samples/client/petstore/rust/src/models/api_response.rs
index 814483602dd..d83716a9a1b 100644
--- a/samples/client/petstore/rust/src/models/api_response.rs
+++ b/samples/client/petstore/rust/src/models/api_response.rs
@@ -11,7 +11,7 @@
 /// ApiResponse : Describes the result of uploading an image resource
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ApiResponse {
     #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
     pub code: Option<i32>,
diff --git a/samples/client/petstore/rust/src/models/category.rs b/samples/client/petstore/rust/src/models/category.rs
index 8cb5797ee1c..4b2c812339b 100644
--- a/samples/client/petstore/rust/src/models/category.rs
+++ b/samples/client/petstore/rust/src/models/category.rs
@@ -11,7 +11,7 @@
 /// Category : A category for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Category {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/src/models/order.rs b/samples/client/petstore/rust/src/models/order.rs
index 24ad342497a..637dd71cde5 100644
--- a/samples/client/petstore/rust/src/models/order.rs
+++ b/samples/client/petstore/rust/src/models/order.rs
@@ -11,7 +11,7 @@
 /// Order : An order for a pets from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Order {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -23,7 +23,7 @@ pub struct Order {
     pub ship_date: Option<String>,
     /// Order Status
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
     #[serde(rename = "complete", skip_serializing_if = "Option::is_none")]
     pub complete: Option<bool>,
 }
@@ -43,7 +43,7 @@ impl Order {
 }
 
 /// Order Status
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "placed")]
     Placed,
diff --git a/samples/client/petstore/rust/src/models/pet.rs b/samples/client/petstore/rust/src/models/pet.rs
index e3c61239cdc..efc6f370ff5 100644
--- a/samples/client/petstore/rust/src/models/pet.rs
+++ b/samples/client/petstore/rust/src/models/pet.rs
@@ -11,7 +11,7 @@
 /// Pet : A pet for sale in the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -25,7 +25,7 @@ pub struct Pet {
     pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
 }
 
 impl Pet {
@@ -43,7 +43,7 @@ impl Pet {
 }
 
 /// pet status in the store
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "available")]
     Available,
diff --git a/samples/client/petstore/rust/src/models/tag.rs b/samples/client/petstore/rust/src/models/tag.rs
index c7cbdf2cc05..69e361463e3 100644
--- a/samples/client/petstore/rust/src/models/tag.rs
+++ b/samples/client/petstore/rust/src/models/tag.rs
@@ -11,7 +11,7 @@
 /// Tag : A tag for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Tag {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/src/models/user.rs b/samples/client/petstore/rust/src/models/user.rs
index e54ed701306..e204a5e325c 100644
--- a/samples/client/petstore/rust/src/models/user.rs
+++ b/samples/client/petstore/rust/src/models/user.rs
@@ -11,7 +11,7 @@
 /// User : A User who is purchasing from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,