Added a couple more items to components table