More template support --kazu