Fixed to work with the new graph table