Add labelling fields to component types #238

see #238