   [s slug-fn SLUGFN code "Function to build slug from filename"]
   (boot/with-pre-wrap fileset
     (let [slug-fn       (or slug-fn default-slug-fn)
-          files         (get-meta fileset)
+          files         (get-perun-meta fileset)
           updated-files (into {}
                               (for [[f m] files]
                                 [f (assoc m :slug (slug-fn f))]))]
       (u/dbug "Generated Slugs:\n%s\n"
               (pr-str (map :slug (vals updated-files))))
       (u/info "Added slugs to %s files\n" (count updated-files))
-      (with-meta fileset {:metadata updated-files}))))
+      (with-perun-meta fileset updated-files))))
 
 (defn ^:private default-permalink-fn [metadata]
   (str  "/" (:slug metadata) "/index.html"))

  (let [tmp (boot/tmp-dir!)
        options (merge +collection-defaults+ *opts*)]
    (boot/with-pre-wrap fileset
      (let [files (vals (get-meta fileset))
            filtered-files (filter (:filterer options) files)
            sorted-files (sort-by (:sortby options) (:comparator options) filtered-files)
            render-fn (:renderer options)

  "Render pages"
  [o out-dir  OUTDIR   str  "The output directory"
   r renderer RENDERER code "Page renderer"]
  (let [tmp     (boot/tmp-dir!)
        options (merge +render-defaults+ *opts*)]
    (boot/with-pre-wrap fileset
      (let [files (vals (get-perun-meta fileset))]
        (doseq [file files]
          (let [render-fn (:renderer options)
                html (render-fn file)
