Remove config dependency
Remove unused param
Add mustache support