migrating to insider service_info + various fixes to make new version working