Add pivot table and clean up migration process
Add pivot table and clean up migration process