Add two more component types for convenience.