diff --git a/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache b/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
index bc391cbd0ad..ae854b3edeb 100644
--- a/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/Model.xcdatamodel.mustache
@@ -2,8 +2,10 @@
 <model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15D21" minimumToolsVersion="Xcode 7.0">
 
     {{#models}}{{#model}}<entity name="{{{classname}}}ManagedObject" representedClassName="{{{classname}}}ManagedObject" syncable="YES">
-{{#vars}}{{#complexType}}       <relationship name="{{name}}" {{^required}}optional="YES"{{/required}} {{#isListContainer}}toMany="YES"{{/isListContainer}}{{^isListContainer}}maxCount="1"{{/isListContainer}} deletionRule="Cascade" destinationEntity="{{{complexType}}}ManagedObject" syncable="YES"/>{{/complexType}}{{^complexType}}       <attribute name="{{name}}" {{^required}}optional="YES"{{/required}} attributeType="{{#isString}}String{{/isString}}{{#isInteger}}Integer 16{{/isInteger}}{{#isLong}}Double{{/isLong}}{{#isDouble}}Double{{/isDouble}}{{#isFloat}}Float{{/isFloat}}{{#isByteArray}}Binary{{/isByteArray}}{{#isBinary}}Binary{{/isBinary}}{{#isListContainer}}Transformable{{/isListContainer}}{{#isMapContainer}}Transformable{{/isMapContainer}}{{#isBoolean}}Boolean{{/isBoolean}}{{#isDate}}Date{{/isDate}}{{#isDateTime}}Date{{/isDateTime}}" syncable="YES"/>{{/complexType}}
+{{#vars}}{{#complexType}}       <relationship name="{{name}}" {{^required}}optional="YES"{{/required}} {{#isListContainer}}toMany="YES"{{/isListContainer}}{{^isListContainer}}maxCount="1"{{/isListContainer}} deletionRule="Cascade" destinationEntity="{{{complexType}}}ManagedObject" syncable="YES"/>{{/complexType}}{{^complexType}}       <attribute name="{{name}}" {{^required}}optional="YES"{{/required}} attributeType="{{#isString}}String{{/isString}}{{#isInteger}}Integer 16{{/isInteger}}{{#isLong}}Double{{/isLong}}{{#isDouble}}Double{{/isDouble}}{{#isFloat}}Float{{/isFloat}}{{#isByteArray}}Binary{{/isByteArray}}{{#isBinary}}Binary{{/isBinary}}{{#isListContainer}}Transformable{{/isListContainer}}{{#isMapContainer}}Transformable{{/isMapContainer}}{{#isBoolean}}Boolean{{/isBoolean}}{{#isDate}}Date{{/isDate}}{{#isDateTime}}Date{{/isDateTime}}" syncable="YES"/>{{/complexType}}{{#vendorExtensions.x-unique-id-key}}
+    <uniquenessConstraints><uniquenessConstraint><constraint value="{{name}}"/></uniquenessConstraint></uniquenessConstraints>{{/vendorExtensions.x-unique-id-key}}
 {{/vars}}
+
     </entity>
     {{/model}}{{/models}}
 </model>
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index ae4e66fba69..2a4a548458e 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -13,7 +13,11 @@
   }
   return self;
 }
-
+{{#vars}}{{^vendorExtensions.x-unique-id-key}}{{/vendorExtensions.x-unique-id-key}}{{#vendorExtensions.x-unique-id-key}}
+-(NSString*)indexPropertyName {
+    return @"{{name}}";
+}
+{{/vendorExtensions.x-unique-id-key}}{{/vars}}
 {{#discriminator}}
 /**
  * Maps "discriminator" value to the sub-class name, so that inheritance is supported.
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
index ee4c0bfbcc9..109feba388e 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -717,6 +717,7 @@ definitions:
       id:
         type: integer
         format: int64
+        x-is-unique: true
       username:
         type: string
       firstName:
@@ -754,6 +755,7 @@ definitions:
       id:
         type: integer
         format: int64
+        x-is-unique: true
       category:
         $ref: '#/definitions/Category'
       name:
diff --git a/samples/client/petstore/objc/README.md b/samples/client/petstore/objc/README.md
index 44bff87c42e..f34a1340e1d 100644
--- a/samples/client/petstore/objc/README.md
+++ b/samples/client/petstore/objc/README.md
@@ -6,7 +6,7 @@ This ObjC package is automatically generated by the [Swagger Codegen](https://gi
 
 - API version: 1.0.0
 - Package version: 
-- Build date: 2016-05-27T16:03:28.462+02:00
+- Build date: 2016-06-06T12:11:50.444+02:00
 - Build package: class io.swagger.codegen.languages.ObjcClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
index a926598ce5f..2ec5c9b0fcc 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <ISO8601/ISO8601.h>
-#import <AFNetworking.h>
+#import <AFNetworking/AFNetworking.h>
 #import "SWGJSONResponseSerializer.h"
 #import "SWGJSONRequestSerializer.h"
 #import "SWGQueryParamCollection.h"
diff --git a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
index 66305707b17..f004200b2eb 100644
--- a/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
+++ b/samples/client/petstore/objc/SwaggerClient/Core/SWGApiClient.m
@@ -50,6 +50,7 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
 - (instancetype)initWithBaseURL:(NSURL *)url {
     self = [super initWithBaseURL:url];
     if (self) {
+        self.timeoutInterval = 60;
         self.requestSerializer = [AFJSONRequestSerializer serializer];
         self.responseSerializer = [AFJSONResponseSerializer serializer];
         self.securityPolicy = [self customSecurityPolicy];
@@ -87,6 +88,11 @@ static NSString * SWG__fileNameForResponse(NSURLResponse *response) {
     [self.requestSerializer setValue:value forHTTPHeaderField:forKey];
 }
 
+- (void)setRequestSerializer:(AFHTTPRequestSerializer<AFURLRequestSerialization> *)requestSerializer {
+    [super setRequestSerializer:requestSerializer];
+    requestSerializer.timeoutInterval = self.timeoutInterval;
+}
+
 #pragma mark - Cache Methods
 
 +(void)clearCache {
diff --git a/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
index d6c893f1d25..112261be531 100644
--- a/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
+++ b/samples/client/petstore/objc/SwaggerClient/Model/SWGModel.xcdatamodeld/SWGModel.xcdatamodel/contents
@@ -4,6 +4,7 @@
     <entity name="SWGCategoryManagedObject" representedClassName="SWGCategoryManagedObject" syncable="YES">
        <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+
     </entity>
     <entity name="SWGOrderManagedObject" representedClassName="SWGOrderManagedObject" syncable="YES">
        <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
@@ -12,6 +13,7 @@
        <attribute name="shipDate" optional="YES" attributeType="Date" syncable="YES"/>
        <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="complete" optional="YES" attributeType="Boolean" syncable="YES"/>
+
     </entity>
     <entity name="SWGPetManagedObject" representedClassName="SWGPetManagedObject" syncable="YES">
        <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
@@ -20,10 +22,12 @@
        <attribute name="photoUrls"  attributeType="Transformable" syncable="YES"/>
        <relationship name="tags" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SWGTagManagedObject" syncable="YES"/>
        <attribute name="status" optional="YES" attributeType="String" syncable="YES"/>
+
     </entity>
     <entity name="SWGTagManagedObject" representedClassName="SWGTagManagedObject" syncable="YES">
        <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+
     </entity>
     <entity name="SWGUserManagedObject" representedClassName="SWGUserManagedObject" syncable="YES">
        <attribute name="_id" optional="YES" attributeType="Double" syncable="YES"/>
@@ -34,6 +38,7 @@
        <attribute name="password" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="phone" optional="YES" attributeType="String" syncable="YES"/>
        <attribute name="userStatus" optional="YES" attributeType="Integer 16" syncable="YES"/>
+
     </entity>
     
 </model>
\ No newline at end of file