Post migration logic changes