Adding delivery model and migration