Update for new BoilerPlate.