adding mustache support