diff --git a/demo/firestore-mixin-demo.html b/demo/firebase-firestore-mixin-collection-demo.html
similarity index 54%
rename from demo/firestore-mixin-demo.html
rename to demo/firebase-firestore-mixin-collection-demo.html
index 23b938c..bbc5c95 100644
--- a/demo/firestore-mixin-demo.html
+++ b/demo/firebase-firestore-mixin-collection-demo.html
@@ -1,6 +1,6 @@
 <link rel="import" href="../firebase-firestore-mixin.html">
 
-<dom-module id="user-list">
+<dom-module id="firebase-firestore-mixin-collection-demo">
   <template>
     <ul>
     <dom-repeat items="[[users]]"><template>
@@ -11,8 +11,8 @@
 </dom-module>
 
 <script>
-  class UserList extends Polymer.FirestoreMixin(Polymer.Element) {
-    static get is() { return 'user-list'; }
+  class FirebaseFirestoreMixinCollectionDemo extends Polymer.FirestoreMixin(Polymer.Element) {
+    static get is() { return 'firebase-firestore-mixin-collection-demo'; }
     static get properties() {
       return {
         users: {
@@ -23,5 +23,5 @@
       }
     }
   }
-  customElements.define(UserList.is, UserList);
-</script>
\ No newline at end of file
+  customElements.define(FirebaseFirestoreMixinCollectionDemo.is, FirebaseFirestoreMixinCollectionDemo);
+</script>
diff --git a/demo/firebase-firestore-mixin-document-demo.html b/demo/firebase-firestore-mixin-document-demo.html
new file mode 100644
index 0000000..0dad502
--- /dev/null
+++ b/demo/firebase-firestore-mixin-document-demo.html
@@ -0,0 +1,26 @@
+<link rel="import" href="../firebase-firestore-mixin.html">
+
+<dom-module id="firebase-firestore-mixin-document-demo">
+  <template>
+    <div>[[user.name]]</div>
+  </template>
+</dom-module>
+
+<script>
+  class FirebaseFirestoreMixinDocumentDemo extends Polymer.FirestoreMixin(Polymer.Element) {
+    static get is() { return 'firebase-firestore-mixin-document-demo'; }
+    static get properties() {
+      return {
+        uid: {
+          type: String,
+          value: 'mBylIa6HUTUU5e4npnoE',
+        },
+        user: {
+          type: Object,
+          doc: 'users/{uid}',
+        }
+      }
+    }
+  }
+  customElements.define(FirebaseFirestoreMixinDocumentDemo.is, FirebaseFirestoreMixinDocumentDemo);
+</script>
diff --git a/demo/firestore.html b/demo/firebase-firestore.html
similarity index 68%
rename from demo/firestore.html
rename to demo/firebase-firestore.html
index 6ae443f..c1cfd84 100644
--- a/demo/firestore.html
+++ b/demo/firebase-firestore.html
@@ -14,13 +14,17 @@
     <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
     <link rel="import" href="../../polymer/polymer.html">
     <link rel="import" href="../firebase-app.html">
-    <link rel="import" href="firestore-mixin-demo.html">
+    <link rel="import" href="firebase-firestore-mixin-collection-demo.html">
+    <link rel="import" href="firebase-firestore-mixin-document-demo.html">
     <firebase-app auth-domain="polymerfire-test.firebaseapp.com"
       database-url="https://polymerfire-test.firebaseio.com/"
       api-key="AIzaSyDTP-eiQezleFsV2WddFBAhF_WEzx_8v_g"
       project-id="polymerfire-test"></firebase-app>
   </head>
   <body>
-    <user-list></user-list>
+    Collection:
+    <firebase-firestore-mixin-collection-demo></firebase-firestore-mixin-collection-demo>
+    Document:
+    <firebase-firestore-mixin-document-demo></firebase-firestore-mixin-document-demo>
   </body>
 </html>
diff --git a/firebase-firestore-mixin.html b/firebase-firestore-mixin.html
index 370a1e5..b4e9a19 100644
--- a/firebase-firestore-mixin.html
+++ b/firebase-firestore-mixin.html
@@ -4,30 +4,34 @@
   throw new Error('Polymer.FirestoreMixin must be imported after Polymer itself.');
 }
 
-(context => {
-  const MATCH_RE = /\{[a-z0-9_]+\}/gi;
+{
+  const PROPERTY_BINDING_REGEXP = /{([^{]+)}/g;
   const TRANSFORMS = {
     doc: function(snap) { return iDoc(snap); },
     collection: function(snap) { return snap.empty ? [] : snap.docs.map(doc => iDoc(doc)) }
   }
 
-  function parsePath(path) {
-    let result;
-    let parts = path.split(MATCH_RE);
-    let props = (path.match(MATCH_RE) || []).map(m => m.substr(1, m.length - 2));
-    return {parts, props};
+  const isOdd = (x) => x & 1 === 1;
+
+  const parsePath = (path) => {
+    const parts = path.split(PROPERTY_BINDING_REGEXP);
+    let literals = [], props = [];
+    parts.forEach((part, index) => {
+      (isOdd(index) ? props : literals).push(part);
+    })
+    return {literals, props};
   }
 
-  function stitch(parts, values) {
+  const stitch = (literals, values) => {
     let whole = '';
-    for (var i = 0; i < parts.length; i++) {
-      whole += parts[i];
+    for (var i = 0; i < literals.length; i++) {
+      whole += literals[i];
       whole += values[i] || '';
     }
     return whole;
   }
 
-	function collect(what, which) {
+	const collect = (what, which) => {
 		let res = {};
 		while (what) {
 			res = Object.assign({}, what[which], res); // Respect prototype priority
@@ -36,7 +40,7 @@
 		return res;
 	};
 
-  function iDoc(snap) {
+  const iDoc = (snap) => {
     if (snap.exists) {
       return Object.assign({__id__: snap.id}, snap.data());
     } else {
@@ -177,7 +181,7 @@
           return;
         }
 
-        const collPath = stitch(config.parts, propArgs);
+        const collPath = stitch(config.literals, propArgs);
         const assigner = snap => {
           this[name] = TRANSFORMS[type](snap);
           this[name + 'Ready'] = true;
@@ -207,5 +211,5 @@
       }
     }
   }
-})(window);
-</script>
\ No newline at end of file
+}
+</script>
