Allow adding components to components
Updated version