Update for smoother package upgrading