Use new packaging mechanism.