Update to use gpm-ng format