Updated packages, changed deprecated code