First hack for the new graph loader