Template and short-hand syntax changes