Migrate to cargo (p106-p110)