HGM improvements and updating an import script