Use new structures for RG-PG search