Update to support templatize 0.2.1