[Thinh] Change the templates