WIP support the new GH format