Some design and one more (somehow) forgotten migration.