Updated for BreakoutComponents and DeltaMessage