Add change scaffolding
Migrate and annotate