Added a couple of component types.

Trying to define custom type.

Work in progress

Change-Id: Ia1f0815189b4d6336ae110b5ae2f11274becf31e