Migration to the new API

Didn't checked with delivery_carrier_deposit yet
you insert |= instead =, i think