Adding mustache support