[Fix] Templates are more modular