Adapt to new HitPattern