Update for new packaging system