diff --git a/mogenerator.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme b/mogenerator.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme
index 724c064f..6c965087 100644
--- a/mogenerator.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme
+++ b/mogenerator.xcodeproj/xcshareddata/xcschemes/mogenerator.xcscheme
@@ -61,6 +61,20 @@
             ReferencedContainer = "container:mogenerator.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "--model /Users/tomek/Code/mobile-bo-ios/HiringStoreKit/HiringStoreKit/DataModel/hiring.xcdatamodeld"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--output-dir /Users/tomek/Desktop"
+            isEnabled = "YES">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--swift"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
diff --git a/momcom/NSAttributeDescription+momcom.m b/momcom/NSAttributeDescription+momcom.m
index 63dda0ba..497a7a2c 100644
--- a/momcom/NSAttributeDescription+momcom.m
+++ b/momcom/NSAttributeDescription+momcom.m
@@ -11,6 +11,7 @@
 
 static NSDictionary *attributeTypeForString;
 const NSString *const kUsesScalarAttributeType = @"mogenerator.usesScalarAttributeType";
+const NSString *const kAttributeValueClassName = @"attributeValueClassName";
 
 @implementation NSAttributeDescription (momcom)
 
@@ -50,6 +51,13 @@ + (NSAttributeDescription *)baseEntityForXML:(NSXMLElement *)xmlNode
             [attributeDescription setAttributeType:[attributeType integerValue]];
         }
     }
+    
+    NSXMLNode *customClassNameElement = [xmlNode attributeForName:@"customClassName"];
+    if (customClassNameElement != nil) {
+        NSMutableDictionary *userInfo = [[attributeDescription userInfo] mutableCopy];
+        userInfo[kAttributeValueClassName] = [customClassNameElement stringValue];
+        [attributeDescription setUserInfo:userInfo.copy];
+    }
 
     NSXMLNode *userScalarElement = [xmlNode attributeForName:@"usesScalarValueType"];
     if (userScalarElement != nil) {