Added support for component types.