Add helpers for ACMP