Migrate the last two listeners in itm-impl module