Updated migration code to handle indicators