Make template more modular