Added support for components to integration table
May need some work