Update for new interface