Support post-migration