Minimal templates changes