Adapt to JAC