Basic modernization updates