Figured some stuff out. There is now only 1 component type. API has been
ported to accomodate.