Added a couple more components.

I think most of the components are listed, we just need to discuss what
products to use in those roles.