Better handling of HGM local information