Added WITH template