Make migration safer, separate delegate into own section