Revert "Delete WrapperComponent functionality"

This reverts commit bda7716ba29e1ae8b8fc2ae066d1d1cc0c76e0cf.