Update for ivory changes