[HighWire 2.0] Support more attachment types