Add back component for Stackato use lost in merge