Improved access incident migration code