Update for modern package system