Post-migration Support

Post-migrations support