Add some wrapping around component instances