Update for recent changes