Added models for all component types