Add generic component container