Update for packaging