Simplify template filling