Fix templates to integrate better