Updates for zetta migration