Added packaging mechanism