More components as bundles