diff --git a/pass/PasswordStore.swift b/pass/PasswordStore.swift
index 9e13734..5c74347 100644
--- a/pass/PasswordStore.swift
+++ b/pass/PasswordStore.swift
@@ -123,10 +123,14 @@ class PasswordStore {
     }
     
     func updatePasswordEntityCoreData() {
-        let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordEntity")
-        let deleteRequest = NSBatchDeleteRequest(fetchRequest: fetchRequest)
+        let passwordEntityFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordEntity")
+        let passwordCategoryEntityFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordCategoryEntity")
+        let passwordEntityDeleteRequest = NSBatchDeleteRequest(fetchRequest: passwordEntityFetchRequest)
+        let passwordCategoryEntityDeleteRequest = NSBatchDeleteRequest(fetchRequest: passwordCategoryEntityFetchRequest)
+
         do {
-            try context.execute(deleteRequest)
+            try context.execute(passwordEntityDeleteRequest)
+            try context.execute(passwordCategoryEntityDeleteRequest)
         } catch let error as NSError {
             print(error)
         }
@@ -143,6 +147,7 @@ class PasswordStore {
                     for i in 0 ..< items.count - 1 {
                         let passwordCategoryEntity = PasswordCategoryEntity(context: context)
                         passwordCategoryEntity.category = items[i]
+                        passwordCategoryEntity.level = Int16(i)
                         passwordCategoryEntity.password = passwordEntity
                     }
                 }
@@ -168,10 +173,11 @@ class PasswordStore {
     }
     
     func fetchPasswordCategoryEntityCoreData(password: PasswordEntity) -> [PasswordCategoryEntity] {
-        let passwordCategoryEntityFetch = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordCategoryEntity")
-        passwordCategoryEntityFetch.predicate = NSPredicate(format: "password = %@", password)
+        let passwordCategoryEntityFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordCategoryEntity")
+        passwordCategoryEntityFetchRequest.predicate = NSPredicate(format: "password = %@", password)
+        passwordCategoryEntityFetchRequest.sortDescriptors = [NSSortDescriptor(key: "level", ascending: true)]
         do {
-            let passwordCategoryEntities = try context.fetch(passwordCategoryEntityFetch) as! [PasswordCategoryEntity]
+            let passwordCategoryEntities = try context.fetch(passwordCategoryEntityFetchRequest) as! [PasswordCategoryEntity]
             return passwordCategoryEntities
         } catch {
             fatalError("Failed to fetch employees: \(error)")
diff --git a/pass/pass.xcdatamodeld/pass.xcdatamodel/contents b/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
index 050cfa4..fb1f10e 100644
--- a/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
+++ b/pass/pass.xcdatamodeld/pass.xcdatamodel/contents
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16D32" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="PasswordCategoryEntity" representedClassName="PasswordCategoryEntity" syncable="YES" codeGenerationType="class">
-        <attribute name="category" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="category" attributeType="String" syncable="YES"/>
+        <attribute name="level" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES" indexed="YES" syncable="YES"/>
         <relationship name="password" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PasswordEntity" inverseName="categories" inverseEntity="PasswordEntity" syncable="YES"/>
     </entity>
     <entity name="PasswordEntity" representedClassName="PasswordEntity" syncable="YES" codeGenerationType="class">
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
         <attribute name="raw" optional="YES" attributeType="Binary" syncable="YES"/>
-        <attribute name="rawPath" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="rawPath" attributeType="String" syncable="YES"/>
         <relationship name="categories" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="PasswordCategoryEntity" inverseName="password" inverseEntity="PasswordCategoryEntity" syncable="YES"/>
     </entity>
     <elements>
-        <element name="PasswordEntity" positionX="-63" positionY="-18" width="128" height="103"/>
-        <element name="PasswordCategoryEntity" positionX="115" positionY="-9" width="128" height="73"/>
+        <element name="PasswordCategoryEntity" positionX="115" positionY="-9" width="128" height="90"/>
+        <element name="PasswordEntity" positionX="-63" positionY="-18" width="128" height="105"/>
     </elements>
 </model>
\ No newline at end of file