Make templates more modular