[Component] Addressing

Replaces #576.