Update from last breaking changes