diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift
index 85632f2..acba564 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ListObserverDemoViewController.swift	
@@ -32,9 +32,9 @@ struct ColorsDemo {
             
             switch self {
                 
-            case .all: return Where(true)
-            case .light: return Palette.where({ $0.brightness >= 0.9 })
-            case .dark: return Palette.where({ $0.brightness <= 0.4 })
+            case .all: return .init()
+            case .light: return (\Palette.brightness >= 0.9)
+            case .dark: return (\Palette.brightness <= 0.4)
             }
         }
     }
@@ -45,7 +45,7 @@ struct ColorsDemo {
             
             self.palettes.refetch(
                 self.filter.whereClause(),
-                Palette.orderBy(ascending: { $0.hue })
+                OrderBy<Palette>(.ascending(\.hue))
             )
         }
     }
@@ -74,9 +74,9 @@ struct ColorsDemo {
             )
         )
         return ColorsDemo.stack.monitorSectionedList(
-            From<Palette>(),
-            SectionBy(Palette.keyPath({ $0.colorName })),
-            Palette.orderBy(ascending: { $0.hue })
+            From<Palette>()
+                .sectionBy(\.colorName)
+                .orderBy(.ascending(\.hue))
         )
     }()
 }
diff --git a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift
index 502bcbc..059c735 100644
--- a/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
+++ b/CoreStoreDemo/CoreStoreDemo/List and Object Observers Demo/ObjectObserverDemoViewController.swift	
@@ -50,7 +50,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
     
     required init?(coder aDecoder: NSCoder) {
         
-        if let palette = ColorsDemo.stack.fetchOne(From<Palette>(), Palette.orderBy(ascending: { $0.hue })) {
+        if let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue))) {
             
             self.monitor = ColorsDemo.stack.monitorObject(palette)
         }
@@ -64,7 +64,7 @@ class ObjectObserverDemoViewController: UIViewController, ObjectObserver {
                 }
             )
             
-            let palette = ColorsDemo.stack.fetchOne(From<Palette>(), Palette.orderBy(ascending: { $0.hue }))!
+            let palette = ColorsDemo.stack.fetchOne(From<Palette>().orderBy(.ascending(\.hue)))!
             self.monitor = ColorsDemo.stack.monitorObject(palette)
         }