diff --git a/GLLara.xcodeproj/project.pbxproj b/GLLara.xcodeproj/project.pbxproj
index 2e0709e..4593c38 100644
--- a/GLLara.xcodeproj/project.pbxproj
+++ b/GLLara.xcodeproj/project.pbxproj
@@ -75,7 +75,6 @@
 		523BBB052880BCB300B2D52E /* GLLGameControllerManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523BBB042880BCB300B2D52E /* GLLGameControllerManager.swift */; };
 		523BBB072880C78600B2D52E /* GLLPreferenceKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 523BBB062880C78600B2D52E /* GLLPreferenceKeys.swift */; };
 		523D368116BEB29F004FAD4B /* GLLSubItemController.m in Sources */ = {isa = PBXBuildFile; fileRef = 523D368016BEB29F004FAD4B /* GLLSubItemController.m */; };
-		523D368516BED84B004FAD4B /* GLLItemMeshTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 523D368416BED84A004FAD4B /* GLLItemMeshTexture.m */; };
 		523DE0D61604A14200BB9F61 /* glasses.modelparams.plist in Resources */ = {isa = PBXBuildFile; fileRef = 523DE0D51604A14200BB9F61 /* glasses.modelparams.plist */; };
 		523DE0E01604A5ED00BB9F61 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52B9E09616027FC800641518 /* Foundation.framework */; };
 		523DE0E31604A5ED00BB9F61 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 523DE0E21604A5ED00BB9F61 /* main.m */; };
@@ -273,6 +272,7 @@
 		52B6C5212BE2947B005E53CE /* GLLDropTargetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C5202BE2947B005E53CE /* GLLDropTargetView.swift */; };
 		52B6C5372BE2AB0E005E53CE /* ObjFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C5362BE2AB0E005E53CE /* ObjFile.swift */; };
 		52B6C5392BE2EB26005E53CE /* MtlFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C5382BE2EB26005E53CE /* MtlFile.swift */; };
+		52B6C53C2BE56696005E53CE /* GLLItemMeshTexture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B6C53A2BE5645B005E53CE /* GLLItemMeshTexture.swift */; };
 		52B9E0781602086D00641518 /* objFileParameters.modelparams.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52B9E0771602086D00641518 /* objFileParameters.modelparams.plist */; };
 		52B9E0AE1602815800641518 /* RenderParameters.strings in Resources */ = {isa = PBXBuildFile; fileRef = 52B9E0B01602815800641518 /* RenderParameters.strings */; };
 		52BB206815F8275E00937450 /* doppelganger.modelparams.plist in Resources */ = {isa = PBXBuildFile; fileRef = 52BB206715F8275E00937450 /* doppelganger.modelparams.plist */; };
@@ -499,8 +499,6 @@
 		523BBB062880C78600B2D52E /* GLLPreferenceKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLPreferenceKeys.swift; sourceTree = "<group>"; };
 		523D367F16BEB29F004FAD4B /* GLLSubItemController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLLSubItemController.h; sourceTree = "<group>"; };
 		523D368016BEB29F004FAD4B /* GLLSubItemController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLLSubItemController.m; sourceTree = "<group>"; };
-		523D368316BED849004FAD4B /* GLLItemMeshTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLLItemMeshTexture.h; sourceTree = "<group>"; };
-		523D368416BED84A004FAD4B /* GLLItemMeshTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLLItemMeshTexture.m; sourceTree = "<group>"; };
 		523DE0D51604A14200BB9F61 /* glasses.modelparams.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = glasses.modelparams.plist; sourceTree = "<group>"; };
 		523DE0DE1604A5ED00BB9F61 /* parseItems */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = parseItems; sourceTree = BUILT_PRODUCTS_DIR; };
 		523DE0E21604A5ED00BB9F61 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -748,6 +746,7 @@
 		52B6C5202BE2947B005E53CE /* GLLDropTargetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLDropTargetView.swift; sourceTree = "<group>"; };
 		52B6C5362BE2AB0E005E53CE /* ObjFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjFile.swift; sourceTree = "<group>"; };
 		52B6C5382BE2EB26005E53CE /* MtlFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MtlFile.swift; sourceTree = "<group>"; };
+		52B6C53A2BE5645B005E53CE /* GLLItemMeshTexture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GLLItemMeshTexture.swift; sourceTree = "<group>"; };
 		52B9E0771602086D00641518 /* objFileParameters.modelparams.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = objFileParameters.modelparams.plist; path = ../Shaders/objFileParameters.modelparams.plist; sourceTree = "<group>"; };
 		52B9E09616027FC800641518 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		52B9E0AF1602815800641518 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/RenderParameters.strings; sourceTree = "<group>"; };
@@ -1351,6 +1350,7 @@
 		5296941F15F4112E00DF2FA3 /* Scene members */ = {
 			isa = PBXGroup;
 			children = (
+				52B6C53A2BE5645B005E53CE /* GLLItemMeshTexture.swift */,
 				52AF115415FCD4A000DF2565 /* GLLCameraTarget.h */,
 				52AF115515FCD4A000DF2565 /* GLLCameraTarget.m */,
 				5291DB9215FBF7BC00ECDBCA /* GLLAmbientLight.h */,
@@ -1375,8 +1375,6 @@
 				526AB3141609BD4300940A74 /* GLLItemMesh+OBJExport.m */,
 				526AB31A1609C7C300940A74 /* GLLItem+OBJExport.h */,
 				526AB31B1609C7C300940A74 /* GLLItem+OBJExport.m */,
-				523D368316BED849004FAD4B /* GLLItemMeshTexture.h */,
-				523D368416BED84A004FAD4B /* GLLItemMeshTexture.m */,
 				5214470916DBF206003E260F /* GLLItemMesh+MeshExport.swift */,
 				5214470C16DC2312003E260F /* GLLItem+MeshExport.swift */,
 				521102EE2899C430001BE4BC /* GLLItemBoneExtensions.swift */,
@@ -1913,6 +1911,7 @@
 				52B6C5372BE2AB0E005E53CE /* ObjFile.swift in Sources */,
 				526D5AE62060596000DCDE85 /* GLLNotifications.m in Sources */,
 				5274447027FE21F100E5A3FD /* GLLModelMesh+OBJExport.swift in Sources */,
+				52B6C53C2BE56696005E53CE /* GLLItemMeshTexture.swift in Sources */,
 				52C9F6201600CCFC003272E1 /* GLLFloatRenderParameter.m in Sources */,
 				52C9F6231600CCFC003272E1 /* GLLColorRenderParameter.m in Sources */,
 				52D3D72916029BD9006CB743 /* GLLRenderAccessoryViewController.m in Sources */,
@@ -1969,7 +1968,6 @@
 				52653D8116BAB729001D802F /* GLLPoseExporter.m in Sources */,
 				523BBAFF287B23D600B2D52E /* GLLRenderWindow.swift in Sources */,
 				523D368116BEB29F004FAD4B /* GLLSubItemController.m in Sources */,
-				523D368516BED84B004FAD4B /* GLLItemMeshTexture.m in Sources */,
 				522783B01C0B7FC0002E43FD /* GLLRenderParameterSelectionPlaceholder.m in Sources */,
 				525BF29B2879E95800E30D48 /* GLLAppDelegate.swift in Sources */,
 				52F73E9E288BDBA700A580EC /* GLLAmbientLightViewController.swift in Sources */,
diff --git a/GLLara/Core Data/GLLSceneModel.xcdatamodeld/GLLSceneModel 5.xcdatamodel/contents b/GLLara/Core Data/GLLSceneModel.xcdatamodeld/GLLSceneModel 5.xcdatamodel/contents
index 2627fe6..072bc4b 100644
--- a/GLLara/Core Data/GLLSceneModel.xcdatamodeld/GLLSceneModel 5.xcdatamodel/contents	
+++ b/GLLara/Core Data/GLLSceneModel.xcdatamodeld/GLLSceneModel 5.xcdatamodel/contents	
@@ -1,123 +1,108 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21G83" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="GLLAmbientLight" representedClassName="GLLAmbientLight" parentEntity="GLLLight" syncable="YES">
-        <attribute name="color" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer" syncable="YES"/>
+        <attribute name="color" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer"/>
     </entity>
     <entity name="GLLCamera" representedClassName="GLLCamera" syncable="YES">
-        <attribute name="cameraLocked" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="distance" attributeType="Float" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="farDistance" attributeType="Float" defaultValueString="100" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="fieldOfViewY" attributeType="Float" minValueString="1" maxValueString="179" defaultValueString="65" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="index" attributeType="Integer 64" minValueString="0" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="latitude" attributeType="Float" minValueString="-1.5707963267949" maxValueString="1.5707963267949" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="longitude" attributeType="Float" minValueString="0" maxValueString="6.28318530717959" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="nearDistance" attributeType="Float" minValueString="1e-05" defaultValueString="0.01" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionX" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionY" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionZ" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="windowHeight" attributeType="Float" defaultValueString="480" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="windowSizeLocked" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="windowWidth" attributeType="Float" defaultValueString="640" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="target" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLCameraTarget" inverseName="cameras" inverseEntity="GLLCameraTarget" syncable="YES"/>
+        <attribute name="cameraLocked" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="distance" attributeType="Float" defaultValueString="2" usesScalarValueType="NO"/>
+        <attribute name="farDistance" attributeType="Float" defaultValueString="100" usesScalarValueType="NO"/>
+        <attribute name="fieldOfViewY" attributeType="Float" minValueString="1" maxValueString="179" defaultValueString="65" usesScalarValueType="NO"/>
+        <attribute name="index" attributeType="Integer 64" minValueString="0" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="latitude" attributeType="Float" minValueString="-1.5707963267949" maxValueString="1.5707963267949" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="longitude" attributeType="Float" minValueString="0" maxValueString="6.28318530717959" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="nearDistance" attributeType="Float" minValueString="1e-05" defaultValueString="0.01" usesScalarValueType="NO"/>
+        <attribute name="positionX" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionY" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionZ" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="windowHeight" attributeType="Float" defaultValueString="480" usesScalarValueType="NO"/>
+        <attribute name="windowSizeLocked" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="windowWidth" attributeType="Float" defaultValueString="640" usesScalarValueType="NO"/>
+        <relationship name="target" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLCameraTarget" inverseName="cameras" inverseEntity="GLLCameraTarget"/>
     </entity>
     <entity name="GLLCameraTarget" representedClassName="GLLCameraTarget" syncable="YES">
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <relationship name="bones" optional="YES" toMany="YES" minCount="1" deletionRule="Nullify" destinationEntity="GLLItemBone" inverseName="cameraTargets" inverseEntity="GLLItemBone" syncable="YES"/>
-        <relationship name="cameras" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="GLLCamera" inverseName="target" inverseEntity="GLLCamera" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <relationship name="bones" optional="YES" toMany="YES" minCount="1" deletionRule="Nullify" destinationEntity="GLLItemBone" inverseName="cameraTargets" inverseEntity="GLLItemBone"/>
+        <relationship name="cameras" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="GLLCamera" inverseName="target" inverseEntity="GLLCamera"/>
     </entity>
     <entity name="GLLColorRenderParameter" representedClassName="GLLColorRenderParameter" parentEntity="GLLRenderParameter" syncable="YES">
-        <attribute name="value" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer" syncable="YES"/>
+        <attribute name="value" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer"/>
     </entity>
     <entity name="GLLDirectionalLight" representedClassName="GLLDirectionalLight" parentEntity="GLLLight" syncable="YES">
-        <attribute name="diffuseColor" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer" syncable="YES"/>
-        <attribute name="isEnabled" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="latitude" attributeType="Float" minValueString="-1.5707963267949" maxValueString="1.5707963267949" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="longitude" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.28318530717959" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="specularColor" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer" syncable="YES"/>
+        <attribute name="diffuseColor" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer"/>
+        <attribute name="isEnabled" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO"/>
+        <attribute name="latitude" attributeType="Float" minValueString="-1.5707963267949" maxValueString="1.5707963267949" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="longitude" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.28318530717959" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="specularColor" optional="YES" attributeType="Transformable" valueTransformerName="GLLColorValueTransformer"/>
     </entity>
     <entity name="GLLFloatRenderParameter" representedClassName="GLLFloatRenderParameter" parentEntity="GLLRenderParameter" syncable="YES">
-        <attribute name="value" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="value" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
     </entity>
     <entity name="GLLItem" representedClassName="GLLItem" syncable="YES">
-        <attribute name="displayName" optional="YES" attributeType="String" spotlightIndexingEnabled="YES" syncable="YES"/>
-        <attribute name="isVisible" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="itemURL" optional="YES" transient="YES" syncable="YES"/>
-        <attribute name="itemURLBookmark" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="model" optional="YES" transient="YES" syncable="YES"/>
-        <attribute name="normalChannelAssignmentB" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="normalChannelAssignmentG" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="4" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="normalChannelAssignmentR" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="scaleX" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="scaleY" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="scaleZ" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="bones" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="GLLItemBone" inverseName="items" inverseEntity="GLLItemBone" syncable="YES"/>
-        <relationship name="childItems" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GLLItem" inverseName="parent" inverseEntity="GLLItem" syncable="YES"/>
-        <relationship name="meshes" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GLLItemMesh" inverseName="item" inverseEntity="GLLItemMesh" syncable="YES"/>
-        <relationship name="parent" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItem" inverseName="childItems" inverseEntity="GLLItem" syncable="YES"/>
-        <fetchedProperty name="cameraTargets" optional="YES" syncable="YES">
+        <attribute name="displayName" optional="YES" attributeType="String" spotlightIndexingEnabled="YES"/>
+        <attribute name="isVisible" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO"/>
+        <attribute name="itemURL" optional="YES" transient="YES"/>
+        <attribute name="itemURLBookmark" optional="YES" attributeType="Binary"/>
+        <attribute name="model" optional="YES" transient="YES"/>
+        <attribute name="normalChannelAssignmentB" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="normalChannelAssignmentG" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="4" usesScalarValueType="NO"/>
+        <attribute name="normalChannelAssignmentR" attributeType="Integer 16" minValueString="0" maxValueString="5" defaultValueString="2" usesScalarValueType="NO"/>
+        <attribute name="positionX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="scaleX" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO"/>
+        <attribute name="scaleY" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO"/>
+        <attribute name="scaleZ" optional="YES" attributeType="Float" defaultValueString="1" usesScalarValueType="NO"/>
+        <relationship name="bones" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="GLLItemBone" inverseName="items" inverseEntity="GLLItemBone"/>
+        <relationship name="childItems" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GLLItem" inverseName="parent" inverseEntity="GLLItem"/>
+        <relationship name="meshes" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GLLItemMesh" inverseName="item" inverseEntity="GLLItemMesh"/>
+        <relationship name="parent" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItem" inverseName="childItems" inverseEntity="GLLItem"/>
+        <fetchedProperty name="cameraTargets" optional="YES">
             <fetchRequest name="fetchedPropertyFetchRequest" entity="GLLCameraTarget" predicateString="boneTransformations.item == $FETCH_SOURCE"/>
         </fetchedProperty>
     </entity>
     <entity name="GLLItemBone" representedClassName="GLLItemBone" syncable="YES">
-        <attribute name="positionX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="positionZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationX" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationY" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="rotationZ" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="cameraTargets" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLCameraTarget" inverseName="bones" inverseEntity="GLLCameraTarget" syncable="YES"/>
-        <relationship name="items" toMany="YES" minCount="1" deletionRule="Nullify" ordered="YES" destinationEntity="GLLItem" inverseName="bones" inverseEntity="GLLItem" elementID="item" syncable="YES"/>
+        <attribute name="positionX" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionY" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="positionZ" optional="YES" attributeType="Float" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationX" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationY" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="rotationZ" optional="YES" attributeType="Float" minValueString="0" maxValueString="6.3" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <relationship name="cameraTargets" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLCameraTarget" inverseName="bones" inverseEntity="GLLCameraTarget"/>
+        <relationship name="items" toMany="YES" minCount="1" deletionRule="Nullify" ordered="YES" destinationEntity="GLLItem" inverseName="bones" inverseEntity="GLLItem" elementID="item"/>
     </entity>
     <entity name="GLLItemMesh" representedClassName="GLLItemMesh" syncable="YES">
-        <attribute name="cullFaceMode" optional="YES" attributeType="Integer 16" minValueString="0" maxValueString="2" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="displayName" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="isBlended" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="isCustomBlending" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="isVisible" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="shaderBase" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="shaderName" optional="YES" attributeType="String" syncable="YES"/>
-        <relationship name="item" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItem" inverseName="meshes" inverseEntity="GLLItem" syncable="YES"/>
-        <relationship name="renderParameters" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLRenderParameter" inverseName="mesh" inverseEntity="GLLRenderParameter" syncable="YES"/>
-        <relationship name="shaderFeatures" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLShaderFeature" inverseName="mesh" inverseEntity="GLLShaderFeature" syncable="YES"/>
-        <relationship name="textures" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLItemMeshTexture" inverseName="mesh" inverseEntity="GLLItemMeshTexture" syncable="YES"/>
+        <attribute name="cullFaceMode" optional="YES" attributeType="Integer 16" minValueString="0" maxValueString="2" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="displayName" optional="YES" attributeType="String"/>
+        <attribute name="isBlended" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="isCustomBlending" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO"/>
+        <attribute name="isVisible" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO"/>
+        <attribute name="shaderBase" optional="YES" attributeType="String"/>
+        <attribute name="shaderName" optional="YES" attributeType="String"/>
+        <relationship name="item" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItem" inverseName="meshes" inverseEntity="GLLItem"/>
+        <relationship name="renderParameters" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLRenderParameter" inverseName="mesh" inverseEntity="GLLRenderParameter"/>
+        <relationship name="shaderFeatures" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLShaderFeature" inverseName="mesh" inverseEntity="GLLShaderFeature"/>
+        <relationship name="textures" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="GLLItemMeshTexture" inverseName="mesh" inverseEntity="GLLItemMeshTexture"/>
     </entity>
     <entity name="GLLItemMeshTexture" representedClassName="GLLItemMeshTexture" syncable="YES">
-        <attribute name="identifier" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="texCoordSet" optional="YES" attributeType="Integer 16" defaultValueString="-1" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="textureBookmarkData" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="textureURL" optional="YES" transient="YES" syncable="YES"/>
-        <relationship name="mesh" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="textures" inverseEntity="GLLItemMesh" syncable="YES"/>
+        <attribute name="identifier" optional="YES" attributeType="String"/>
+        <attribute name="texCoordSet" optional="YES" attributeType="Integer 16" defaultValueString="-1" usesScalarValueType="NO"/>
+        <attribute name="textureBookmarkData" optional="YES" attributeType="Binary"/>
+        <attribute name="textureURL" optional="YES" transient="YES"/>
+        <relationship name="mesh" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="textures" inverseEntity="GLLItemMesh"/>
     </entity>
     <entity name="GLLLight" isAbstract="YES" syncable="YES">
-        <attribute name="index" optional="YES" attributeType="Integer 64" minValueString="0" maxValueString="3" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
+        <attribute name="index" optional="YES" attributeType="Integer 64" minValueString="0" maxValueString="3" defaultValueString="0" usesScalarValueType="NO"/>
     </entity>
     <entity name="GLLRenderParameter" representedClassName="GLLRenderParameter" isAbstract="YES" syncable="YES">
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <relationship name="mesh" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="renderParameters" inverseEntity="GLLItemMesh" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String"/>
+        <relationship name="mesh" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="renderParameters" inverseEntity="GLLItemMesh"/>
     </entity>
     <entity name="GLLShaderFeature" syncable="YES">
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <relationship name="mesh" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="shaderFeatures" inverseEntity="GLLItemMesh" syncable="YES"/>
+        <attribute name="name" attributeType="String"/>
+        <relationship name="mesh" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="GLLItemMesh" inverseName="shaderFeatures" inverseEntity="GLLItemMesh"/>
     </entity>
-    <elements>
-        <element name="GLLAmbientLight" positionX="0" positionY="0" width="128" height="44"/>
-        <element name="GLLCamera" positionX="0" positionY="0" width="128" height="254"/>
-        <element name="GLLCameraTarget" positionX="0" positionY="0" width="128" height="90"/>
-        <element name="GLLColorRenderParameter" positionX="0" positionY="0" width="128" height="44"/>
-        <element name="GLLDirectionalLight" positionX="0" positionY="0" width="128" height="104"/>
-        <element name="GLLFloatRenderParameter" positionX="0" positionY="0" width="128" height="60"/>
-        <element name="GLLItem" positionX="0" positionY="0" width="128" height="404"/>
-        <element name="GLLItemBone" positionX="0" positionY="0" width="128" height="149"/>
-        <element name="GLLItemMesh" positionX="0" positionY="0" width="128" height="194"/>
-        <element name="GLLItemMeshTexture" positionX="0" positionY="0" width="128" height="104"/>
-        <element name="GLLLight" positionX="0" positionY="0" width="128" height="60"/>
-        <element name="GLLRenderParameter" positionX="0" positionY="0" width="128" height="75"/>
-        <element name="GLLShaderFeature" positionX="18" positionY="171" width="128" height="59"/>
-    </elements>
 </model>
\ No newline at end of file
diff --git a/GLLara/GLLDocument.m b/GLLara/GLLDocument.m
index 9b5dcd6..0c6feaf 100644
--- a/GLLara/GLLDocument.m
+++ b/GLLara/GLLDocument.m
@@ -18,7 +18,6 @@
 #import "GLLItem.h"
 #import "GLLItemBone.h"
 #import "GLLItemMesh.h"
-#import "GLLItemMeshTexture.h"
 #import "GLLItem+OBJExport.h"
 #import "GLLLogarithmicValueTransformer.h"
 #import "GLLPoseExporter.h"
diff --git a/GLLara/GLLItemMesh+MeshExport.swift b/GLLara/GLLItemMesh+MeshExport.swift
index 53edac2..f2664ac 100644
--- a/GLLara/GLLItemMesh+MeshExport.swift
+++ b/GLLara/GLLItemMesh+MeshExport.swift
@@ -51,7 +51,7 @@ extension GLLItemMesh {
     }
     
     private func textureUrls(description: XnaLaraShaderDescription) -> [URL] {
-        return description.textureUniformsInOrder.map { texture(withIdentifier: $0).textureURL }
+        return description.textureUniformsInOrder.map { texture(withIdentifier: $0).textureURL as! URL }
     }
     
     func writeASCII() throws -> String {
diff --git a/GLLara/GLLItemMesh.m b/GLLara/GLLItemMesh.m
index 6e57452..a184a3e 100644
--- a/GLLara/GLLItemMesh.m
+++ b/GLLara/GLLItemMesh.m
@@ -11,7 +11,6 @@
 #import <AppKit/NSKeyValueBinding.h>
 
 #import "GLLItem.h"
-#import "GLLItemMeshTexture.h"
 #import "GLLRenderParameter.h"
 #import "NSArray+Map.h"
 
diff --git a/GLLara/GLLItemMeshState.swift b/GLLara/GLLItemMeshState.swift
index 6d8627e..66cab90 100644
--- a/GLLara/GLLItemMeshState.swift
+++ b/GLLara/GLLItemMeshState.swift
@@ -121,7 +121,7 @@ class GLLItemMeshState {
         
         if let url = textureAssignment?.textureURL {
             // Load from the given URL (where possible
-            return try await drawer.resourceManager.textureAsync(url: url)
+            return try await drawer.resourceManager.textureAsync(url: url as URL)
         } else if let data = itemMesh.mesh.textures[identifier]?.data {
             // Load what the model provided
             return try GLLTexture(data: data, sourceURL: itemMesh.mesh.model!.baseURL, device: drawer.resourceManager.metalDevice)
@@ -244,7 +244,7 @@ class GLLItemMeshState {
         
         if let url = textureAssignment?.textureURL {
             // Use URL in model
-            return url
+            return url as URL
         } else if (itemMesh.mesh.textures[identifier]?.data) != nil {
             // Use URL of model
             return itemMesh.mesh.model!.baseURL
diff --git a/GLLara/GLLItemMeshTexture.h b/GLLara/GLLItemMeshTexture.h
deleted file mode 100644
index a17cd25..0000000
--- a/GLLara/GLLItemMeshTexture.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  GLLItemMeshTexture.h
-//  GLLara
-//
-//  Created by Torsten Kammer on 03.02.13.
-//  Copyright (c) 2013 Torsten Kammer. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-@class GLLItemMesh;
-@class GLLTextureDescription;
-
-/*!
- * @abstract Stores which textures are associated with which uniform values.
- */
-@interface GLLItemMeshTexture : NSManagedObject
-
-// URL of the texture
-@property (nonatomic, retain) NSURL *textureURL;
-@property (nonatomic, retain) NSData * textureBookmarkData;
-
-// A string identifying the purpose/shader uniform variable this texture is
-// bound to.
-@property (nonatomic, retain) NSString * identifier;
-
-// The texture coordinates to use for this texture; -1 if not set because it's from an old file
-@property (nonatomic, assign) int16_t texCoordSet;
-
-// The mesh this texture belongs to.
-@property (nonatomic, retain) GLLItemMesh *mesh;
-
-// Description
-@property (nonatomic, readonly) GLLTextureDescription *textureDescription;
-
-@end
diff --git a/GLLara/GLLItemMeshTexture.m b/GLLara/GLLItemMeshTexture.m
deleted file mode 100644
index ce57e02..0000000
--- a/GLLara/GLLItemMeshTexture.m
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-//  GLLItemMeshTexture.m
-//  GLLara
-//
-//  Created by Torsten Kammer on 03.02.13.
-//  Copyright (c) 2013 Torsten Kammer. All rights reserved.
-//
-
-#import "GLLItemMeshTexture.h"
-
-#import "GLLItemMesh.h"
-
-#import "GLLara-Swift.h"
-
-@implementation GLLItemMeshTexture
-
-@dynamic textureURL;
-@dynamic textureBookmarkData;
-@dynamic identifier;
-@dynamic texCoordSet;
-@dynamic mesh;
-
-- (void)awakeFromFetch
-{
-    [super awakeFromFetch];
-    
-    // Get URL from bookmark
-    NSData *bookmarkData = self.textureBookmarkData;
-    if (bookmarkData)
-    {
-        NSURL *textureURL = [NSURL URLByResolvingBookmarkData:bookmarkData options:0 relativeToURL:nil bookmarkDataIsStale:NULL error:NULL];
-        [self setPrimitiveValue:textureURL forKey:@"textureURL"];
-    }
-}
-
-- (void)willSave
-{
-    // Put URL into bookmark
-    NSURL *textureURL = [self primitiveValueForKey:@"textureURL"];
-    if (textureURL)
-    {
-        NSData *bookmark = [textureURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:nil relativeToURL:nil error:NULL];
-        [self setPrimitiveValue:bookmark forKey:@"textureBookmarkData"];
-    }
-    else
-        [self setPrimitiveValue:nil forKey:@"textureBookmarkData"];
-}
-
-- (void)setTexCoordSet:(int16_t)texCoordSet {
-    [self willChangeValueForKey:@"texCoordSet"];
-    [self setPrimitiveValue:@(texCoordSet) forKey:@"texCoordSet"];
-    [self.mesh updateShader];
-    [self didChangeValueForKey:@"texCoordSet"];
-}
-
-- (GLLTextureDescription *)textureDescription
-{
-    return [self.mesh.mesh.shader descriptionForTexture:self.identifier];
-}
-
-@end
diff --git a/GLLara/GLLItemMeshTexture.swift b/GLLara/GLLItemMeshTexture.swift
new file mode 100644
index 0000000..b12acf5
--- /dev/null
+++ b/GLLara/GLLItemMeshTexture.swift
@@ -0,0 +1,68 @@
+//
+//  GLLItemMeshTexture+CoreDataClass.swift
+//  GLLara
+//
+//  Created by Torsten Kammer on 03.05.24.
+//  Copyright © 2024 Torsten Kammer. All rights reserved.
+//
+//
+
+import Foundation
+import CoreData
+
+@objc(GLLItemMeshTexture)
+public class GLLItemMeshTexture: NSManagedObject {
+    
+    // Get URL from bookmark
+    @objc public override func awakeFromFetch() {
+        if let data = textureBookmarkData {
+            var stale = false
+            if let textureUrl = try? URL(resolvingBookmarkData: data, options: [], relativeTo: nil, bookmarkDataIsStale: &stale) {
+                self.setPrimitiveValue(textureUrl, forKey: "textureURL")
+            }
+        }
+    }
+    
+    @objc public override func willSave() {
+        // Put URL into bookmark
+        if let url = self.primitiveValue(forKey: "textureURL") as? NSURL {
+            let textureUrl = url as URL
+            if let bookmark = try? textureUrl.bookmarkData() {
+                self.setPrimitiveValue(bookmark, forKey: "textureBookmarkData")
+            }
+        } else {
+            self.setPrimitiveValue(nil, forKey: "textureBookmarkData")
+        }
+    }
+    
+    @objc var texCoordSet: Int {
+        set {
+            willChangeValue(for: \.texCoordSet)
+            setPrimitiveValue(NSNumber(value: newValue), forKey: "texCoordSet")
+            mesh?.updateShader()
+            didChangeValue(for: \.texCoordSet)
+        }
+        get {
+            return (primitiveValue(forKey: "texCoordSet") as! NSNumber).intValue
+        }
+    }
+    
+    @objc var textureDescription: GLLTextureDescription? {
+        guard let identifier, let mesh, let shader = mesh.mesh.shader else {
+            return nil
+        }
+        return shader.description(forTexture: identifier)
+    }
+}
+
+extension GLLItemMeshTexture {
+
+    @nonobjc public class func fetchRequest() -> NSFetchRequest<GLLItemMeshTexture> {
+        return NSFetchRequest<GLLItemMeshTexture>(entityName: "GLLItemMeshTexture")
+    }
+
+    @NSManaged public var identifier: String?
+    @NSManaged public var textureBookmarkData: Data?
+    @NSManaged public var textureURL: NSURL?
+    @NSManaged public var mesh: GLLItemMesh?
+}
diff --git a/GLLara/GLLItemMeshTextureSelectionPlaceholder.m b/GLLara/GLLItemMeshTextureSelectionPlaceholder.m
index 29dc7af..aea4a4a 100644
--- a/GLLara/GLLItemMeshTextureSelectionPlaceholder.m
+++ b/GLLara/GLLItemMeshTextureSelectionPlaceholder.m
@@ -9,7 +9,7 @@
 #import "GLLItemMeshTextureSelectionPlaceholder.h"
 
 #import "GLLItemMesh.h"
-#import "GLLItemMeshTexture.h"
+#import "GLLara-Swift.h"
 
 @interface GLLItemMeshTextureSelectionPlaceholder ()
 
diff --git a/GLLara/GLLItemViewController.m b/GLLara/GLLItemViewController.m
index fd635fa..4204501 100644
--- a/GLLara/GLLItemViewController.m
+++ b/GLLara/GLLItemViewController.m
@@ -12,7 +12,6 @@
 
 #import "GLLItem.h"
 #import "GLLItemMesh.h"
-#import "GLLItemMeshTexture.h"
 #import "GLLara-Swift.h"
 
 @interface GLLItemViewController ()
diff --git a/GLLara/GLLMeshViewController.m b/GLLara/GLLMeshViewController.m
index 4ce54ee..331d3c8 100644
--- a/GLLara/GLLMeshViewController.m
+++ b/GLLara/GLLMeshViewController.m
@@ -10,7 +10,6 @@
 
 #import "GLLItemMesh.h"
 #import "GLLItemMeshSelectionPlaceholder.h"
-#import "GLLItemMeshTexture.h"
 #import "GLLItemMeshTextureSelectionPlaceholder.h"
 #import "GLLRenderParameter.h"
 #import "GLLRenderParameterSelectionPlaceholder.h"
diff --git a/GLLara/GLLara-Bridging-Header.h b/GLLara/GLLara-Bridging-Header.h
index 4819369..d1cee43 100644
--- a/GLLara/GLLara-Bridging-Header.h
+++ b/GLLara/GLLara-Bridging-Header.h
@@ -15,7 +15,6 @@
 #import "GLLItem.h"
 #import "GLLItemBone.h"
 #import "GLLItemMesh.h"
-#import "GLLItemMeshTexture.h"
 #import "GLLNotifications.h"
 #import "GLLVertexAttrib.h"
 #import "GLLPreferencesWindowController.h"