Separate field teamplates

#108