diff --git a/common/models/article.js b/common/models/article.js
index 3946db12ad..6e78facfd0 100644
--- a/common/models/article.js
+++ b/common/models/article.js
@@ -1,5 +1,9 @@
-'use strict';
+import { Observable } from 'rx';
 
 module.exports = function(Article) {
-
+  Article.on('dataSourceAttached', () => {
+    Article.findOne$ = Observable.fromNodeCallback(Article.findOne, Article);
+    Article.findById$ = Observable.fromNodeCallback(Article.findById, Article);
+    Article.find$ = Observable.fromNodeCallback(Article.find, Article);
+  });
 };
diff --git a/common/models/popularity.js b/common/models/popularity.js
index 87476dd17d..bf98a71d21 100644
--- a/common/models/popularity.js
+++ b/common/models/popularity.js
@@ -1,5 +1,15 @@
-'use strict';
+import { Observable } from 'rx';
 
 module.exports = function(Popularity) {
-
+  Popularity.on('dataSourceAttached', () => {
+    Popularity.findOne$ = Observable.fromNodeCallback(
+      Popularity.findOne,
+      Popularity
+    );
+    Popularity.findById$ = Observable.fromNodeCallback(
+      Popularity.findById,
+      Popularity
+    );
+    Popularity.find$ = Observable.fromNodeCallback(Popularity.find, Popularity);
+  });
 };