Update for new forge